Merge pull request #85 from cyberious/1.2.x

Remove misleading changelog, no readme changes done
This commit is contained in:
Morgan Haskel
2014-11-06 16:58:19 -08:00

View File

@@ -54,7 +54,7 @@ The following parameters are available in the java module:
* `distribution`: The Java distribution to install. Can be 'jdk','jre', or, where the platform supports alternative packages, 'sun-jdk', 'sun-jre', 'oracle-jdk', 'oracle-jre'. Defaults to 'jdk'. * `distribution`: The Java distribution to install. Can be 'jdk','jre', or, where the platform supports alternative packages, 'sun-jdk', 'sun-jre', 'oracle-jdk', 'oracle-jre'. Defaults to 'jdk'.
*`version`: The version of Java to install, if you want to ensure a particular version. By default, the module ensures that Java is present but does not require a specific version. * `version`: The version of Java to install, if you want to ensure a particular version. By default, the module ensures that Java is present but does not require a specific version.
* `package`: The name of the Java package. This is configurable in case you want to install a non-standard Java package. If not set, the module will install the appropriate package for the `distribution` parameter and target platform. If you set `package`, the `distribution` parameter will do nothing. * `package`: The name of the Java package. This is configurable in case you want to install a non-standard Java package. If not set, the module will install the appropriate package for the `distribution` parameter and target platform. If you set `package`, the `distribution` parameter will do nothing.
@@ -78,7 +78,7 @@ OpenJDK is supported on:
* Debian 6, 7 * Debian 6, 7
* Ubuntu 10.04, 12.04, 14.04 * Ubuntu 10.04, 12.04, 14.04
* Solaris 11 * Solaris 11
* SLES 11 SP1 * SLES 11 SP1, 12
Sun Java is supported on: Sun Java is supported on:
* Debian 6 * Debian 6