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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #1728 from brenton/bz1324729	Brenton Leanhardt	2016-04-08	2	-8/+8
\|\
\| *	Bug 1324729 - Import xPaas image streams failed during 3.2 installation	Brenton Leanhardt	2016-04-07	2	-8/+8
* \|	Merge pull request #1720 from abutcher/fix-docker-install	Brenton Leanhardt	2016-04-07	1	-2/+2
\|\ \ \| \|/ \|/\|
\| *	Test docker_version_result.stdout when determining if docker should be instal...	Andrew Butcher	2016-04-06	1	-2/+2
* \|	Automatic commit of package [openshift-ansible] release [3.0.75-1].	Troy Dawson	2016-04-07	2	-2/+9
* \|	Merge pull request #1719 from kwoodson/oadmrouter	Kenny Woodson	2016-04-07	11	-82/+1375
\|\ \
\| * \|	First attempt at oadm router module	Kenny Woodson	2016-04-07	11	-82/+1375
* \| \|	Merge pull request #1724 from abutcher/nfs-no-common	Brenton Leanhardt	2016-04-07	2	-8/+7
\|\ \ \
\| * \| \|	Remove openshift_common dep from openshift_storage_nfs	Andrew Butcher	2016-04-06	2	-8/+7
* \| \| \|	Merge pull request #1722 from abutcher/containerized-cloudprovider	Brenton Leanhardt	2016-04-07	4	-4/+4
\|\ \ \ \
\| * \| \| \|	Add cloudprovider config dir to docker options.	Andrew Butcher	2016-04-06	4	-4/+4
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #1699 from abutcher/check-cloudprovider-kind	Brenton Leanhardt	2016-04-06	5	-22/+25
\|\ \ \ \
\| * \| \| \|	Check for kind in cloudprovider facts prior to accessing.	Andrew Butcher	2016-04-04	5	-22/+25
* \| \| \| \|	Automatic commit of package [openshift-ansible] release [3.0.74-1].	Brenton Leanhardt	2016-04-06	2	-2/+6
* \| \| \| \|	Merge pull request #1660 from dgoodwin/admission-config	Brenton Leanhardt	2016-04-06	3	-4/+56
\|\ \ \ \ \
\| * \| \| \| \|	Add support for configuring oauth templates.	Devan Goodwin	2016-04-01	3	-3/+28
\| * \| \| \| \|	Add support for templating master admissionConfig.	Devan Goodwin	2016-04-01	3	-1/+28
* \| \| \| \| \|	Automatic commit of package [openshift-ansible] release [3.0.73-1].	Troy Dawson	2016-04-06	2	-2/+19
* \| \| \| \| \|	Merge pull request #1723 from dgoodwin/osbs-dockerfile	Brenton Leanhardt	2016-04-06	1	-10/+16
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	Replace unused Dockerfile with one used for official builds.	Devan Goodwin	2016-04-06	1	-10/+16
\|/ / / / /
* \| \| \| \|	Merge pull request #1721 from kwoodson/userrefresh	Kenny Woodson	2016-04-06	1	-0/+2
\|\ \ \ \ \
\| * \| \| \| \|	Update for zbx_user refresh	Kenny Woodson	2016-04-06	1	-0/+2
* \| \| \| \| \|	Merge pull request #1717 from sdodson/origin-docker-funtimes	Brenton Leanhardt	2016-04-06	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Docker 1.9 is actually cool starting in origin 1.1.4	Scott Dodson	2016-04-06	1	-1/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #1716 from brenton/unmask1	Brenton Leanhardt	2016-04-06	1	-0/+8
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Unmask services	Brenton Leanhardt	2016-04-06	1	-0/+8
\|/ / / / /
* \| \| \| \|	Merge pull request #1695 from brenton/bz1323123	Brenton Leanhardt	2016-04-06	10	-7/+8
\|\ \ \ \ \
\| * \| \| \| \|	Bug 1322788 - The IMAGE_VERSION wasn't added to atomic-openshift-master-api a...	Brenton Leanhardt	2016-04-01	10	-7/+8
\| * \| \| \| \|	Bug 1323123 - upgrade failed to containerized OSE on RHEL Host without ose3.2...	Brenton Leanhardt	2016-04-01	1	-1/+1
* \| \| \| \| \|	Merge pull request #1698 from sdodson/xpaas13	Brenton Leanhardt	2016-04-06	100	-4502/+9996
\|\ \ \ \ \ \
\| * \| \| \| \| \|	XPAAS v1.3 for OSE 3.2	Scott Dodson	2016-04-04	53	-5218/+1805
\| * \| \| \| \| \|	XPAAS 1.3 content for OSE 3.1	Scott Dodson	2016-04-04	48	-37/+8944
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #1654 from dgoodwin/gen-inventory	Brenton Leanhardt	2016-04-05	5	-49/+134
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Write inventory to same directory as quick install config.	Devan Goodwin	2016-03-24	3	-11/+11
\| * \| \| \| \| \|	Add --gen-inventory command to atomic-openshift-installer.	Devan Goodwin	2016-03-24	4	-39/+124
* \| \| \| \| \| \|	Automatic commit of package [openshift-ansible] release [3.0.72-1].	Troy Dawson	2016-04-05	2	-2/+9
* \| \| \| \| \| \|	Merge pull request #1708 from mwoodson/docker-bug	Matt Woodson	2016-04-05	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	when docker is installed, make it 1.8.2 to avoid issues	Matt Woodson	2016-04-05	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #1700 from brenton/32ha	Brenton Leanhardt	2016-04-05	2	-0/+11
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Pacemaker is unsupported for 3.2	Brenton Leanhardt	2016-04-04	2	-0/+11
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #1577 from brenton/docker19	Brenton Leanhardt	2016-04-05	1	-2/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	We require docker 1.9 for the 3.2 upgrade	Brenton Leanhardt	2016-03-09	1	-2/+1
* \| \| \| \| \| \|	Merge pull request #1655 from sdodson/more-docker19	Brenton Leanhardt	2016-04-05	9	-25/+43
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Downgrade to docker 1.8.2 if installing OSE < 3.2	Scott Dodson	2016-04-05	9	-25/+43
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #1704 from kwoodson/yeditfix	Matt Woodson	2016-04-04	8	-37/+109
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fixing regexp. Periods are no longer allowed	Kenny Woodson	2016-04-04	8	-37/+109
* \| \| \| \| \| \|	Automatic commit of package [openshift-ansible] release [3.0.71-1].	Troy Dawson	2016-04-04	2	-2/+7
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #1702 from joelddiaz/heartbeat-severity	Joel Diaz	2016-04-04	1	-0/+5
\|\ \ \ \ \ \
\| * \| \| \| \| \|	add higher severity trigger if no heartbeat for 1 hour	Joel Diaz	2016-04-04	1	-0/+5
* \| \| \| \| \| \|	Merge pull request #1701 from kwoodson/oceditfix	Kenny Woodson	2016-04-04	2	-4/+6
\|\ \ \ \ \ \ \