summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.tito/packages/openshift-ansible2
-rw-r--r--openshift-ansible.spec6
2 files changed, 6 insertions, 2 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible
index 487cfae40..081c93533 100644
--- a/.tito/packages/openshift-ansible
+++ b/.tito/packages/openshift-ansible
@@ -1 +1 @@
-3.6.24-1 ./
+3.6.25-1 ./
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index d395b3ec4..042717704 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.24
+Version: 3.6.25
Release: 1%{?dist}
Summary: Openshift and Atomic Enterprise Ansible
License: ASL 2.0
@@ -270,6 +270,10 @@ Atomic OpenShift Utilities includes
%changelog
+* Mon Apr 17 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.25-1
+- Fix default image tag for enterprise (sdodson@redhat.com)
+- Cast etcd_debug to a boolean (skuznets@redhat.com)
+
* Fri Apr 14 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.24-1
- tox tests: pin test requirement versions (lmeyer@redhat.com)
- This is no longer a widely encountered issue (sdodson@redhat.com)