Merge branch 'fixes_for_centos_versions' of https://github.com/garethr/puppetlabs-java into garethr-fixes_for_centos_versions

Conflicts:
	Modulefile
	README.markdown
	manifests/init.pp
	spec/spec_helper.rb
This commit is contained in:
Brett Porter
2013-06-02 21:26:10 -07:00
9 changed files with 109 additions and 11 deletions

View File

@@ -1,11 +1,10 @@
name 'puppetlabs-java'
version '0.3.0'
source 'git://github.com/puppetlabs/puppetlabs-java'
author 'puppetlabs'
license 'Apache'
summary 'Manage the official Java runtime'
description 'Manage the official Java runtime'
name 'puppetlabs-java'
version '0.3.0'
source 'git://github.com/puppetlabs/puppetlabs-java'
author 'puppetlabs'
license 'Apache'
summary 'Manage the official Java runtime'
description 'Manage the official Java runtime'
project_page 'https://github.com/puppetlabs/puppetlabs-java'
## Add dependencies, if any:
dependency 'puppetlabs/stdlib', '>= 0.1.6'
dependency 'puppetlabs/stdlib', '>= 0.1.6'