summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins CD Merge Bot <tdawson@redhat.com>2017-05-05 06:02:21 -0400
committerJenkins CD Merge Bot <tdawson@redhat.com>2017-05-05 06:02:21 -0400
commitab90d5e3a883698aa92eb2c8127ef72426325add (patch)
treeb512de4d3b679b7de147dd823142a6c0874f62c7
parentf7993afb2fec58b7bd13a70d812bf60deb5b1402 (diff)
downloadopenshift-ab90d5e3a883698aa92eb2c8127ef72426325add.tar.gz
openshift-ab90d5e3a883698aa92eb2c8127ef72426325add.tar.bz2
openshift-ab90d5e3a883698aa92eb2c8127ef72426325add.tar.xz
openshift-ab90d5e3a883698aa92eb2c8127ef72426325add.zip
Automatic commit of package [openshift-ansible] release [3.6.54-1].
Created by command: /usr/bin/tito tag --accept-auto-changelog
-rw-r--r--.tito/packages/openshift-ansible2
-rw-r--r--openshift-ansible.spec9
2 files changed, 9 insertions, 2 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible
index 6eaed1fef..c7d412311 100644
--- a/.tito/packages/openshift-ansible
+++ b/.tito/packages/openshift-ansible
@@ -1 +1 @@
-3.6.53-1 ./
+3.6.54-1 ./
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index 10a04a519..c2fc0d68d 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -9,7 +9,7 @@
%global __requires_exclude ^/usr/bin/ansible-playbook$
Name: openshift-ansible
-Version: 3.6.53
+Version: 3.6.54
Release: 1%{?dist}
Summary: Openshift and Atomic Enterprise Ansible
License: ASL 2.0
@@ -274,6 +274,13 @@ Atomic OpenShift Utilities includes
%changelog
+* Fri May 05 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.54-1
+- Allow oc_ modules to pass unicode results (rteague@redhat.com)
+- Ensure repo cache is clean on the first run (rteague@redhat.com)
+- move etcdctl.yml from etcd to etcd_common role (jchaloup@redhat.com)
+- Modified pick from release-1.5 for updating hawkular htpasswd generation
+ (ewolinet@redhat.com)
+
* Thu May 04 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.53-1
- Correctly setting the primary and replica shard count settings
(ewolinet@redhat.com)