summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins CD Merge Bot <smunilla@redhat.com>2017-07-06 01:38:27 -0400
committerJenkins CD Merge Bot <smunilla@redhat.com>2017-07-06 01:38:27 -0400
commitac6bb627a424110192e2ee55b7a3059f48b19d85 (patch)
treec22d92630ca3e62173b21134029245e3422ed902
parent8334fef76beb800784085472a48aeaaae2d73470 (diff)
downloadopenshift-ac6bb627a424110192e2ee55b7a3059f48b19d85.tar.gz
openshift-ac6bb627a424110192e2ee55b7a3059f48b19d85.tar.bz2
openshift-ac6bb627a424110192e2ee55b7a3059f48b19d85.tar.xz
openshift-ac6bb627a424110192e2ee55b7a3059f48b19d85.zip
Automatic commit of package [openshift-ansible] release [3.6.136-1].
Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.136
-rw-r--r--.tito/packages/openshift-ansible2
-rw-r--r--openshift-ansible.spec11
2 files changed, 11 insertions, 2 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible
index 63ccb247b..a3da9c085 100644
--- a/.tito/packages/openshift-ansible
+++ b/.tito/packages/openshift-ansible
@@ -1 +1 @@
-3.6.135-1 ./
+3.6.136-1 ./
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index 190cf8724..7328dfdbc 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.135
+Version: 3.6.136
Release: 1%{?dist}
Summary: Openshift and Atomic Enterprise Ansible
License: ASL 2.0
@@ -280,6 +280,15 @@ Atomic OpenShift Utilities includes
%changelog
+* Thu Jul 06 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.136-1
+- Synching certs and aggregator configs from first master to all other masters
+ (ewolinet@redhat.com)
+- Addressing servicecatalog doesnt have enough permissions and multimaster
+ config for service-catalog (ewolinet@redhat.com)
+- add back mux_client config that was removed (rmeggins@redhat.com)
+- use master etcd certificates when delegating oadm migrate etcd-ttl
+ (jchaloup@redhat.com)
+
* Wed Jul 05 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.6.135-1
- Update the tag for enterprise service catalog (sdodson@redhat.com)
- Fix missing service domain .svc in NO_PROXY settings (tbielawa@redhat.com)