Merge branch 'preferences' of https://github.com/mediatemple/puppetlabs-java into mediatemple-preferences

Conflicts:
	CHANGELOG
This commit is contained in:
Brett Porter
2013-07-13 13:09:40 +10:00
6 changed files with 181 additions and 27 deletions

View File

@@ -8,6 +8,9 @@ Brett Porter <brett@apache.org>
Nathan R Valentine <nrvale0@gmail.com>
* Add support for Ubuntu quantal and raring
Sharif Nassar <sharif@mediatemple.net>
* Add support for Debian alternatives, and more than one JDK/JRE per platform.
2013-04-04 Reid Vandewiele <reid@puppetlabs.com> - 0.3.0
* Refactor, introduce params pattern