summaryrefslogtreecommitdiffstats
path: root/openshift-ansible.spec
diff options
context:
space:
mode:
authorTim Bielawa <timbielawa@gmail.com>2017-04-28 12:41:09 -0400
committerGitHub <noreply@github.com>2017-04-28 12:41:09 -0400
commitd8a70bbd179c59e121a652f2b590f65ed7889eab (patch)
tree9d8c16df98ac710f1624acb5afc6f0d8be44fc82 /openshift-ansible.spec
parent7de281c7a8ddfcde6b416e3c4b0b2abb6c6c67a7 (diff)
parentb23be0da38759744cebc8d4b454af1299d97a445 (diff)
downloadopenshift-d8a70bbd179c59e121a652f2b590f65ed7889eab.tar.gz
openshift-d8a70bbd179c59e121a652f2b590f65ed7889eab.tar.bz2
openshift-d8a70bbd179c59e121a652f2b590f65ed7889eab.tar.xz
openshift-d8a70bbd179c59e121a652f2b590f65ed7889eab.zip
Merge branch 'master' into contrib_pre-commit_hook
Diffstat (limited to 'openshift-ansible.spec')
-rw-r--r--openshift-ansible.spec17
1 files changed, 16 insertions, 1 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index d6665e1b0..c5fa862dc 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.38
+Version: 3.6.42
Release: 1%{?dist}
Summary: Openshift and Atomic Enterprise Ansible
License: ASL 2.0
@@ -273,6 +273,21 @@ Atomic OpenShift Utilities includes
%changelog
+* Fri Apr 28 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.42-1
+- Fix certificate check Job examples (pep@redhat.com)
+- Add python-boto requirement (pep@redhat.com)
+
+* Thu Apr 27 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.41-1
+- Add bool for proper conditional handling (rteague@redhat.com)
+
+* Thu Apr 27 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.40-1
+- Fix cluster creation with `bin/cluster` when there’s no glusterfs node
+ (lhuard@amadeus.com)
+
+* Thu Apr 27 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.39-1
+- Move container build instructions to BUILD.md (pep@redhat.com)
+- Elaborate container image usage instructions (pep@redhat.com)
+
* Wed Apr 26 2017 Jenkins CD Merge Bot <tdawson@redhat.com> 3.6.38-1
- .redhat-ci.yml: also publish journal logs (jlebon@redhat.com)
- Standardize all Origin versioning on 3.6 (rteague@redhat.com)