summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins CD Merge Bot <tdawson@redhat.com>2017-04-25 06:01:37 -0400
committerJenkins CD Merge Bot <tdawson@redhat.com>2017-04-25 06:01:37 -0400
commitb2a69e98cbf4fd91496276bd24b046bb582137ef (patch)
treeb8e72a158ea212b7a66274b79d71dd1f81fd2f87
parent9a2770bdafcb3df6863ff132e0a7e5b4c48a1a24 (diff)
downloadopenshift-b2a69e98cbf4fd91496276bd24b046bb582137ef.tar.gz
openshift-b2a69e98cbf4fd91496276bd24b046bb582137ef.tar.bz2
openshift-b2a69e98cbf4fd91496276bd24b046bb582137ef.tar.xz
openshift-b2a69e98cbf4fd91496276bd24b046bb582137ef.zip
Automatic commit of package [openshift-ansible] release [3.6.36-1].
Created by command: /usr/bin/tito tag --accept-auto-changelog
-rw-r--r--.tito/packages/openshift-ansible2
-rw-r--r--openshift-ansible.spec13
2 files changed, 13 insertions, 2 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible
index 7cc3ff281..8cf3bfc2d 100644
--- a/.tito/packages/openshift-ansible
+++ b/.tito/packages/openshift-ansible
@@ -1 +1 @@
-3.6.35-1 ./
+3.6.36-1 ./
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index 330072ac4..98c764576 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.35
+Version: 3.6.36
Release: 1%{?dist}
Summary: Openshift and Atomic Enterprise Ansible
License: ASL 2.0
@@ -273,6 +273,17 @@ Atomic OpenShift Utilities includes
%changelog
+* 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
+ conditions. (kwoodson@redhat.com)
+- cast openshift_logging_use_mux_client to bool (rmeggins@redhat.com)
+- mux does not require privileged, only hostmount-anyuid (rmeggins@redhat.com)
+- Switched Heapster to use certificates generated by OpenShift
+ (juraci@kroehling.de)
+- Use metrics and logging deployer tag v3.4 for enterprise (sdodson@redhat.com)
+- Remove v1.5 and v1.6 metrics/logging templates (sdodson@redhat.com)
+
* Sun Apr 23 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.35-1
-