summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins CD Merge Bot <tdawson@redhat.com>2017-05-30 10:12:24 -0400
committerJenkins CD Merge Bot <tdawson@redhat.com>2017-05-30 10:12:24 -0400
commit46411cfc431f7960df542c5bdcf62c65f612a965 (patch)
treeb44a1ddb973242a86a1240070c7e6041015762c7
parentff21449b88d4db0666ccad5cde912070f78e61e2 (diff)
downloadopenshift-46411cfc431f7960df542c5bdcf62c65f612a965.tar.gz
openshift-46411cfc431f7960df542c5bdcf62c65f612a965.tar.bz2
openshift-46411cfc431f7960df542c5bdcf62c65f612a965.tar.xz
openshift-46411cfc431f7960df542c5bdcf62c65f612a965.zip
Automatic commit of package [openshift-ansible] release [3.6.86-1].
Created by command: /usr/bin/tito tag --accept-auto-changelog --use-version=3.6.86
-rw-r--r--.tito/packages/openshift-ansible2
-rw-r--r--openshift-ansible.spec12
2 files changed, 12 insertions, 2 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible
index c06826331..9a340c066 100644
--- a/.tito/packages/openshift-ansible
+++ b/.tito/packages/openshift-ansible
@@ -1 +1 @@
-3.6.85-1 ./
+3.6.86-1 ./
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index b27f4c1c4..813cba0d7 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.85
+Version: 3.6.86
Release: 1%{?dist}
Summary: Openshift and Atomic Enterprise Ansible
License: ASL 2.0
@@ -280,6 +280,16 @@ Atomic OpenShift Utilities includes
%changelog
+* Tue May 30 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.86-1
+- Reduce memory requirement to 2gb for fedora ci jobs (sdodson@redhat.com)
+- openshift_logging: increasing *_elasticsearch_* default CPU and memory
+ (jwozniak@redhat.com)
+- Updating python-passlib assert (ewolinet@redhat.com)
+- allow to configure oreg_url specifically for node or master. refs #4233
+ (tobias@tobru.ch)
+- Updating registry-console version to be v3.6 instead of 3.6
+ (ewolinet@redhat.com)
+
* Thu May 25 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.85-1
- Prepending v to registry-console version (ewolinet@redhat.com)
- memory health check: adjust threshold for etcd (lmeyer@redhat.com)