csa/devops/ansible-patches/openshift.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #3683 from kwoodson/py35_scope_fix	Scott Dodson	2017-03-16	21	-63/+63
\|\ \| \| \| \|	Fixing variable naming for 35 scoping.
\| *	Fixing variable naming for 35 scoping.	Kenny Woodson	2017-03-16	21	-63/+63
\| \|
* \|	Merge pull request #3674 from sdodson/fix-ovs-race	OpenShift Bot	2017-03-16	1	-0/+2
\|\ \ \| \| \| \| \| \|	Merged by openshift-bot
\| * \|	Fix containerized openvswitch race	Scott Dodson	2017-03-15	1	-0/+2
\| \| \|
* \| \|	Automatic commit of package [openshift-ansible] release [3.6.1-1].	Jenkins CD Merge Bot	2017-03-16	2	-2/+527
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Created by command: /usr/bin/tito tag --accept-auto-changelog
* \| \|	Merge pull request #3688 from smunilla/master	Scott Dodson	2017-03-16	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Bump version to 3.6.0
\| * \| \|	Bump version to 3.6.0	Samuel Munilla	2017-03-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump up the version to make our daily builds happy.
* \| \| \|	Merge pull request #3675 from sdodson/only_use_excluders_on_masters_nodes	Scott Dodson	2017-03-16	3	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Only call excluder playbooks on masters and nodes
\| * \| \| \|	Only call excluder playbooks on masters and nodes	Scott Dodson	2017-03-15	3	-3/+3
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #3669 from ewolinetz/logging_master_api_port	Scott Dodson	2017-03-16	1	-1/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	Removing dependency on master facts for master_public_url default
\| * \| \|	Removing dependency on master facts for master_public_url default	ewolinetz	2017-03-15	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #3664 from ewolinetz/logging_cherrypick_3657	OpenShift Bot	2017-03-16	7	-17/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \ \ \	Merge branch 'master' into logging_cherrypick_3657	Eric Wolinetz	2017-03-15	9	-16/+38
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Cherry picked from #3657	ewolinetz	2017-03-15	7	-16/+21
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3682 from rhcarvalho/doc-run-single-test	Scott Dodson	2017-03-16	1	-10/+60
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|	Improve CONTRIBUTING guide with testing tricks
\| * \| \| \|	Improve CONTRIBUTING guide with testing tricks	Rodolfo Carvalho	2017-03-16	1	-10/+60
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3673 from sdodson/remove-excluder-status	OpenShift Bot	2017-03-16	3	-90/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \|	Since we've decided that we're no longer paying attention to current	Scott Dodson	2017-03-15	3	-90/+0
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	status remove this as it was toggling things
* \| \| \| \|	Merge pull request #3678 from sdodson/update-versions	Scott Dodson	2017-03-16	2	-6/+6
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Update versions in example inventories
\| * \| \| \|	Update versions in example inventories	Scott Dodson	2017-03-16	2	-6/+6
\|/ / / /
* \| \| \|	Merge pull request #3670 from detiber/killNotifications	Jason DeTiberus	2017-03-15	1	-18/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Remove travis notifications
\| * \| \| \|	Remove travis notifications	Jason DeTiberus	2017-03-15	1	-18/+0
\| \|/ / /
* \| \| \|	Merge pull request #3626 from mtnbikenc/module_rename	OpenShift Bot	2017-03-15	11	-31/+31
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \|	Renaming oadm_manage_node to oc_adm_manage_node	Russell Teague	2017-03-10	11	-31/+31
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3666 from ↵	OpenShift Bot	2017-03-15	1	-2/+6
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	ingvagabund/dont-asume-openshift_upgrade_target-is-not-trivial Merged by openshift-bot
\| * \| \| \|	don't assume openshift_upgrade_target is in a form d.d	Jan Chaloupka	2017-03-15	1	-2/+6
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #3629 from ewolinetz/logging_15_cherrypick	OpenShift Bot	2017-03-15	8	-10/+11
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Merged by openshift-bot
\| * \| \|	cherry picking from #3621 #3614 #3627	ewolinetz	2017-03-10	8	-10/+11
\| \| \| \|
* \| \| \|	Merge pull request #3646 from vishpat/service-account	OpenShift Bot	2017-03-15	2	-0/+23
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \|	Nuage service account handling by single master	Vishal Patil	2017-03-14	2	-0/+23
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3634 from kwoodson/raise_on_prep_failures	OpenShift Bot	2017-03-15	2	-8/+8
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Merged by openshift-bot
\| * \| \| \|	Raise on dry-run failures.	Kenny Woodson	2017-03-13	2	-8/+8
\| \| \| \| \|
* \| \| \| \|	Merge pull request #3650 from mtnbikenc/fix-router	OpenShift Bot	2017-03-15	1	-0/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \|	Add router svcacct cluster-reader role	Russell Teague	2017-03-14	1	-0/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #3658 from ↵	Scott Dodson	2017-03-14	5	-23/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	openshift/revert-3620-enable-docker-during-installation-and-upgrade-by-default Revert "Enable docker during installation and upgrade by default"
\| * \| \| \| \| \|	Revert "Enable docker during installation and upgrade by default"	Steve Kuznetsov	2017-03-14	5	-23/+16
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #3599 from martineg/min_tls_version	OpenShift Bot	2017-03-14	4	-0/+45
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \|	Allow overriding minTLSVersion and cipherSuites	Martin Eggen	2017-03-09	4	-0/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add parameters to allow overriding minTLSVersion and cipherSuites in master and node servingInfo config stanzas.
* \| \| \| \| \| \|	Merge pull request #3620 from ↵	Scott Dodson	2017-03-14	5	-16/+23
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ingvagabund/enable-docker-during-installation-and-upgrade-by-default Enable docker during installation and upgrade by default
\| * \| \| \| \| \| \|	enable docker excluder since the time it is installed	Jan Chaloupka	2017-03-13	5	-16/+23
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #3636 from obuisson/tlsv1.2	OpenShift Bot	2017-03-14	2	-2/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \|	Force to use TLSv1.2 (related to ↵	Olivier Buisson	2017-03-13	2	-2/+2
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/openshift/openshift-ansible/pull/2707)
* \| \| \| \| \|	Merge pull request #3640 from mtnbikenc/refactor-serviceaccount	OpenShift Bot	2017-03-13	7	-104/+29
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \| \|	Refactor and remove openshift_serviceaccount	Russell Teague	2017-03-13	7	-104/+29
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #3641 from detiber/fixSixError	OpenShift Bot	2017-03-13	2	-1/+4
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \|	Revert module_utils six for openshift_health_checker	Jason DeTiberus	2017-03-13	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Embedded version of six in Ansible 2.2.1 does not support add_metaclass, so revert to using python-six.
* \| \| \| \| \|	Merge pull request #3645 from ewolinetz/openshift_logging_meta_fix	Scott Dodson	2017-03-13	1	-1/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cherry picking from #3644
\| * \| \| \| \| \|	Cherry picking from #3644	ewolinetz	2017-03-13	1	-1/+0
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #3622 from kwoodson/remove_incorrect_files	OpenShift Bot	2017-03-13	2	-5163/+0
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	Merged by openshift-bot
\| * \| \| \| \|	Removed unused, unwanted, incorrectly committed code.	Kenny Woodson	2017-03-10	2	-5163/+0
\| \| \| \| \| \|