summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins CD Merge Bot <tdawson@redhat.com>2017-04-25 10:14:52 -0400
committerJenkins CD Merge Bot <tdawson@redhat.com>2017-04-25 10:14:52 -0400
commite19f6d832e7c60c0944fa511d3ef233631c8ecab (patch)
treec13056ee28e22056c3ac06629c0d2c1c569f3206
parent5cc89ead05da446f5f8d7b619eb69cf29928f541 (diff)
downloadopenshift-e19f6d832e7c60c0944fa511d3ef233631c8ecab.tar.gz
openshift-e19f6d832e7c60c0944fa511d3ef233631c8ecab.tar.bz2
openshift-e19f6d832e7c60c0944fa511d3ef233631c8ecab.tar.xz
openshift-e19f6d832e7c60c0944fa511d3ef233631c8ecab.zip
Automatic commit of package [openshift-ansible] release [3.6.37-1].
Created by command: /usr/bin/tito tag --accept-auto-changelog
-rw-r--r--.tito/packages/openshift-ansible2
-rw-r--r--openshift-ansible.spec7
2 files changed, 7 insertions, 2 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible
index 8cf3bfc2d..ca314ce0c 100644
--- a/.tito/packages/openshift-ansible
+++ b/.tito/packages/openshift-ansible
@@ -1 +1 @@
-3.6.36-1 ./
+3.6.37-1 ./
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index 98c764576..63f0a5a2d 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.36
+Version: 3.6.37
Release: 1%{?dist}
Summary: Openshift and Atomic Enterprise Ansible
License: ASL 2.0
@@ -273,6 +273,11 @@ Atomic OpenShift Utilities includes
%changelog
+* Tue Apr 25 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.37-1
+- Differentiate between service serving router certificate and custom
+ openshift_hosted_router_certificate when replacing the router certificate.
+ (abutcher@redhat.com)
+
* Tue Apr 25 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.36-1
- Update swap disable tasks (rteague@redhat.com)
- Removing resource version to remove object conflicts caused by race