Brett Porter cde7046e99 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

2013-06-02 21:47:19 -07:00

..

classes

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

2013-06-02 21:47:19 -07:00

spec_helper.rb

Remove cruft and bumb version number

2013-04-04 20:19:37 -07:00