From 37e4595d5ef83ad97529319fbdd7eeb11d84da5f Mon Sep 17 00:00:00 2001
From: Scott Dodson <sdodson@redhat.com>
Date: Tue, 2 Dec 2014 09:37:31 -0500
Subject: [PATCH] Version 4.1.2

Includes changing license field to 'Apache-2.0' and bumping stdlib
requirement to ensure proper installation in Puppet Enterprise.
---
 CHANGELOG       | 24 +++++++++++++++++++++++-
 Modulefile      |  6 +++---
 README.asciidoc |  4 ++++
 metadata.json   |  6 +++---
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5499c5a3..c294f58d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,30 @@
 CHANGELOG
 =========
 
+4.1.2
+-----
+
+2014-12-12
+
+ * Remove fedora specific code
+ * Fix parse order dependent parameter evaluation
+ * Reconcile class parameter documentation with puppet deployment guide
+ * Add TLS support to ActiveMQ and mcollective via msgserver_tls_enabled
+ parameter
+ * Add quickstarts_json parameter to provide quickstarts. For OpenShift
+ Enterprise if this is null don't deploy a default quickstarts file.
+ * puppetlabs-stdlib >= 4.3.0 is required
+ * RHBZ 1160099 - Ensure DNS firewall rules applied before register_dns
+ * RHBZ 1161486 - Create /etc/openshift/development file
+ * RHBZ 1162050 - Wait longer for primary replicaset instance to come online
+ * RHBZ 1162093 - Fix infrastructure zone dns updates
+ * RHBZ 1162454 - default hostnames should use infra zone if provided
+ * RHBZ 1162901 - ensure correct dns key algo used
+ * RHBZ 1170055 - Ensure activemq service is started
+ * RHBZ 1170859 - Only install recommended cart deps for installed carts
+
 4.1.0
-------
+-----
 
 2014-11-11
 
diff --git a/Modulefile b/Modulefile
index 6d293e8e..c2ea0b2d 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,7 +1,7 @@
 name 'openshift-openshift_origin'
-version '4.1.1'
+version '4.1.2'
 author 'Mojo Lingo, Red Hat'
-license 'ASL'
+license 'Apache-2.0'
 project_page 'https://github.com/openshift/puppet-openshift_origin'
 source 'git://github.com/openshift/puppet-openshift_origin.git'
 summary 'Module for installing Red Hat Openshift'
@@ -9,7 +9,7 @@ description 'Configures OpenShift broker, nodes and support servers'
 dependency 'puppetlabs/java_ks', '>=1.2.5'
 dependency 'rharrison/lokkit', '>=0.2.0'
 dependency 'puppetlabs/ntp', '>=0.1.0'
-dependency 'puppetlabs/stdlib', '>=2.6.0'
+dependency 'puppetlabs/stdlib', '>=4.3.2'
 dependency 'blentz/selinux_types', '>=0.1.0'
 dependency 'puppetlabs/haproxy', '>=0.4.1'
 dependency 'arioch/keepalived', '>=0.0.10'
diff --git a/README.asciidoc b/README.asciidoc
index 5b7d0002..91294d16 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -6,6 +6,10 @@ class, you can configure the OpenShift Origin Broker, Node and support services
 including ActiveMQ, MongoDB, named and OS settings including firewall,
 services, and ntp.
 
+=== Build Status
+image:https://travis-ci.org/openshift/puppet-openshift_origin.svg?branch=master[Build
+Status]
+
 === Authors
 
 * Jamey Owens
diff --git a/metadata.json b/metadata.json
index 135eaa0b..b51b823c 100644
--- a/metadata.json
+++ b/metadata.json
@@ -24,10 +24,10 @@
         }
     ],
     "name": "openshift-openshift_origin",
-    "version": "4.1.1",
+    "version": "4.1.2",
     "source": "git://github.com/openshift/puppet-openshift_origin.git",
     "author": "Mojo Lingo, Red Hat",
-    "license": "ASL",
+    "license": "Apache-2.0",
     "summary": "Module for installing Red Hat Openshift",
     "description": "Configures OpenShift broker, nodes and support servers",
     "project_page": "https://github.com/openshift/puppet-openshift_origin",
@@ -42,7 +42,7 @@
         },
         {
             "name": "puppetlabs/stdlib",
-            "version_requirement": ">=2.6.0"
+            "version_requirement": ">=4.3.2"
         },
         {
             "name": "blentz/selinux_types",