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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make cluster_metrics disabled by default	Diego Castro (dscastro)	2015-08-28	1	-1/+1
\|
*	Merge remote-tracking branch 'openshift/master'	Diego Castro	2015-08-27	44	-230/+935
\|\
\| *	Merge pull request #517 from openshift/revert-513-zbxupdates	Wesley Hearn	2015-08-27	38	-682/+334
\| \|\ \| \| \| \| \| \|	Revert "Zabbix API updates"
\| \| *	Revert "Zabbix API updates"	Kenny Woodson	2015-08-27	38	-682/+334
\| \|/
\| *	Merge pull request #513 from kwoodson/zbxupdates	Wesley Hearn	2015-08-27	38	-334/+682
\| \|\ \| \| \| \| \| \|	Zabbix API updates
\| \| *	Updates for zbx ans module	Kenny Woodson	2015-08-27	38	-334/+682
\| \| \|
\| * \|	Merge pull request #459 from spinolacastro/fluentd	Wesley Hearn	2015-08-27	2	-0/+4
\| \|\ \ \| \| \| \| \| \| \| \|	Configure Fluentd
\| \| * \|	Remove extra space.	Diego Castro (dscastro)	2015-08-26	1	-1/+1
\| \| \| \|
\| \| * \|	Revert Fluentd Facts	Diego Castro	2015-08-14	1	-1/+2
\| \| \| \|
\| \| * \|	Configure Fluentd	Diego Castro	2015-08-12	3	-2/+5
\| \| \| \|
\| * \| \|	Merge pull request #516 from detiber/docker_registry_fix	Wesley Hearn	2015-08-27	1	-11/+13
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Bugfix for extra --add-registry in docker config
\| \| * \| \|	Bugfix for extra --add-registry in docker config	Jason DeTiberus	2015-08-26	1	-11/+13
\| \|/ / /
\| * \| \|	Merge pull request #509 from lhuard1A/configure_docker_registries	Wesley Hearn	2015-08-26	2	-0/+45
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Add options to configure docker registries
\| \| * \| \|	Add options to configure docker registries	Lénaïc Huard	2015-08-26	2	-0/+45
\| \| \| \| \|
\| * \| \| \|	Merge pull request #483 from lhuard1A/issue_471	Wesley Hearn	2015-08-26	5	-79/+43
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Properly pass the "external network" option to the HEAT template
\| \| * \| \| \|	Properly pass the "external network" option to the HEAT template	Lénaïc Huard	2015-08-17	5	-79/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #471
\| * \| \| \| \|	Merge pull request #498 from sdodson/bz1248376	Wesley Hearn	2015-08-26	20	-140/+540
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update latest openshift examples
\| \| * \| \| \| \|	Add jenkins image stream and quickstart	Scott Dodson	2015-08-26	5	-20/+357
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/openshift/origin/pull/4145
\| \| * \| \| \| \|	Update latest openshift examples	Scott Dodson	2015-08-20	15	-120/+183
\| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Merge pull request #510 from lhuard1A/clustered_etcd_libvirt	Wesley Hearn	2015-08-26	2	-2/+11
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add etcd nodes management in libvirt
\| \| * \| \| \| \|	Add etcd nodes management in libvirt	Lénaïc Huard	2015-08-25	2	-2/+11
\| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge pull request #511 from wshearn/label_aws_hosts	Wesley Hearn	2015-08-26	1	-0/+13
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set node labels for AWS hosts
\| \| * \| \| \| \|	Set node labels for AWS hosts	Wesley Hearn	2015-08-25	1	-0/+13
\| \| \|/ / / /
\| * \| \| \| \|	Merge pull request #462 from spinolacastro/clustermetrics	Wesley Hearn	2015-08-26	12	-0/+274
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cluster Metrics
\| \| * \| \| \| \|	Add README and inventory example.	Diego Castro	2015-08-15	2	-0/+39
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Configure cluster metrics	Diego Castro	2015-08-13	10	-0/+235
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Playbook based on https://docs.openshift.org/latest/admin_guide/cluster_metrics.html.
\| * \| \| \| \| \|	Merge pull request #503 from detiber/fixKubeArgs	Brenton Leanhardt	2015-08-26	1	-8/+2
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|	fix apiServerArguments and controllerServerArguments
\| \| * \| \| \| \|	Fix quoting around null	Jason DeTiberus	2015-08-22	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	fix apiServerArguments and controllerServerArguments	Jason DeTiberus	2015-08-22	1	-8/+2
\| \|/ / / / /
* \| / / / /	Merge remote-tracking branch 'openshift/master'	Diego Castro	2015-08-22	60	-93/+1387
\|\\| \| \| \| \| \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Merge pull request #500 from jim-minter/fix-etcd-ca-lifetime	Brenton Leanhardt	2015-08-21	1	-0/+1
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Make CA lifetime 365 days, not 30
\| \| * \| \|	Make CA lifetime 365 days, not 30	Jim Minter	2015-08-21	1	-0/+1
\| \|/ / /
\| * \| \|	Merge pull request #496 from kwoodson/zbxsetup	Matt Woodson	2015-08-20	2	-4/+40
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Playbook for updating users during zabbix setup.
\| \| * \| \|	fixed zbx_user. Update password playbook added	Kenny Woodson	2015-08-20	2	-4/+40
\| \|/ / /
\| * \| \|	Automatic commit of package [openshift-ansible-inventory] release [0.0.9-1].	Kenny Woodson	2015-08-20	2	-2/+28
\| \| \| \|
\| * \| \|	Automatic commit of package [openshift-ansible-bin] release [0.0.19-1].	Kenny Woodson	2015-08-20	2	-2/+20
\| \| \| \|
\| * \| \|	Merge pull request #495 from kwoodson/pvfix1	Kenny Woodson	2015-08-19	1	-0/+10
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	tagging pv
\| \| * \| \|	Added tagging to the pv volumes	Kenny Woodson	2015-08-19	1	-0/+10
\| \|/ / /
\| * \| \|	Merge pull request #493 from kwoodson/pvfix	Kenny Woodson	2015-08-19	1	-0/+7
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	fstab cleanup after pv creation
\| \| * \| \|	remove fstab entry after pv creation	Kenny Woodson	2015-08-19	1	-0/+7
\| \|/ / /
\| * \| \|	Merge pull request #491 from detiber/master	Brenton Leanhardt	2015-08-18	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	another kubelet_args fix
\| \| * \| \|	another kubelet_args fix	Jason DeTiberus	2015-08-18	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge pull request #490 from detiber/master	Brenton Leanhardt	2015-08-18	1	-2/+2
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Fix kubelet_args
\| \| * \| \|	Fix kubelet_args	Jason DeTiberus	2015-08-18	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge pull request #487 from detiber/bz1252337	Brenton Leanhardt	2015-08-18	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Bug 1252337 - Fix for quote error in oauthConfig template
\| \| * \| \|	Bug 1252337 - Fix for quote error in oauthConfig template	Jason DeTiberus	2015-08-17	1	-1/+1
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	https://bugzilla.redhat.com/show_bug.cgi?id=1252337
\| * \| \|	Merge pull request #488 from kwoodson/zbxapi	Kenny Woodson	2015-08-17	9	-24/+761
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Zabbix API updates
\| \| * \| \|	Updates	Kenny Woodson	2015-08-17	9	-24/+761
\| \| \| \| \|
\| * \| \| \|	Merge pull request #444 from aveshagarwal/ae-ansible-merge-uninstall	Brenton Leanhardt	2015-08-17	1	-0/+93
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	AE->OSO ansible uninstall merge
\| \| * \| \| \|	Updated to include origin and atomic-openshift RPMs re-factoring to	Avesh Agarwal	2015-08-17	1	-6/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	include all origin, AE and openshift products. For back-word compatibility, older openshift and AE naming is retained too.