Merge remote-tracking branch 'upstream/1.4.x'

This commit is contained in:
Helen Campbell
2015-12-08 16:23:35 +00:00
3 changed files with 15 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
fixtures: fixtures:
repositories: repositories:
stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib.git' stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
symlinks: symlinks:
java: "#{source_dir}" java: "#{source_dir}"

View File

@@ -1,3 +1,15 @@
## Supported Release 1.4.3
###Summary
Small release for support of newer PE versions. This increments the version of PE in the metadata.json file.
## 2015-10-07 - Supported Release 1.4.2
### Summary
This release fixes the fact to not trigger java every time on OS X when it is not available.
#### Bugfixes
- Causes java\_version fact to not run `java` when java is not installed on OS X
## 2015-07-16 - Supported Release 1.4.1 ## 2015-07-16 - Supported Release 1.4.1
### Summary ### Summary
This release updates the metadata for the upcoming release of PE and update params for OEL to match metadata This release updates the metadata for the upcoming release of PE and update params for OEL to match metadata

View File

@@ -1,6 +1,6 @@
{ {
"name": "puppetlabs-java", "name": "puppetlabs-java",
"version": "1.4.1", "version": "1.4.3",
"author": "puppetlabs", "author": "puppetlabs",
"summary": "Installs the correct Java package on various platforms.", "summary": "Installs the correct Java package on various platforms.",
"license": "Apache-2.0", "license": "Apache-2.0",
@@ -78,7 +78,7 @@
"requirements": [ "requirements": [
{ {
"name": "pe", "name": "pe",
"version_requirement": ">= 3.0.0 < 2015.3.0" "version_requirement": ">= 3.0.0 < 2015.4.0"
}, },
{ {
"name": "puppet", "name": "puppet",