Merge pull request #136 from hunner/release_1.4.1

Release 1.4.1
2015-07-15 13:33:32 -07:00 · 2015-07-15 13:14:56 -07:00 · 2015-07-14 10:06:44 -07:00 · 2015-07-14 10:03:56 -07:00 · 2015-07-09 14:57:39 -07:00
3 changed files with 10 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 2015-07-16 - Supported Release 1.4.1
+### Summary
+This release updates the metadata for the upcoming release of PE and update params for OEL to match metadata
+
+#### Bugfixes:
+- Add missing OEL to params
+
 ##2015-07-07 - Supported Release 1.4.0
 ###Summary
 This release adds several new features, bugfixes, documentation updates, and test improvements.
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -15,7 +15,7 @@ class java::params {
  case $::osfamily {
    'RedHat': {
      case $::operatingsystem {
-        'RedHat', 'CentOS', 'OracleLinux', 'Scientific': {
+        'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL': {
          if (versioncmp($::operatingsystemrelease, '5.0') < 0) {
            $jdk_package = 'java-1.6.0-sun-devel'
            $jre_package = 'java-1.6.0-sun'
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
  "name": "puppetlabs-java",
-  "version": "1.4.0",
+  "version": "1.4.1",
  "author": "puppetlabs",
  "summary": "Installs the correct Java package on various platforms.",
  "license": "Apache-2.0",
@@ -78,7 +78,7 @@
  "requirements": [
    {
      "name": "pe",
-      "version_requirement": ">= 3.0.0 < 5.0.0"
+      "version_requirement": ">= 3.0.0 < 2015.3.0"
    },
    {
      "name": "puppet",
Author	SHA1	Message	Date
Bryan Jen	7c70ceaed7	Merge pull request #136 from hunner/release_1.4.1 Release 1.4.1	2015-07-15 13:33:32 -07:00
Hunter Haugen	76c5d2c93d	Release 1.4.1	2015-07-15 13:14:56 -07:00
Hunter Haugen	8e5b079fd7	Merge pull request #135 from zreichert/fix Add OEL operatingsystem to java::params	2015-07-14 10:06:44 -07:00
Zach Reichert	e8b3dd534f	Add OEL operatingsystem to java::params	2015-07-14 10:03:56 -07:00
Hunter Haugen	9efcb78c1f	Merge pull request #134 from mhaskel/merge_1.4.x_to_master Merge 1.4.x to master	2015-07-09 14:57:39 -07:00