Brett Porter e73f175f3a Merge branch 'master' of https://github.com/rombert/puppetlabs-java into rombert-master ...

Conflicts:
	manifests/params.pp

2013-07-13 13:22:44 +10:00

..

config.pp

Support multiple JVM, and Debian alternatives.

2013-06-20 16:29:20 -07:00

init.pp

Support multiple JVM, and Debian alternatives.

2013-06-20 16:29:20 -07:00

params.pp

Merge branch 'master' of https://github.com/rombert/puppetlabs-java into rombert-master

2013-07-13 13:22:44 +10:00