summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1230 from openshift/masterKenny Woodson2016-01-192-0/+159
|\
| * Merge pull request #1217 from kwoodson/remove_rubyKenny Woodson2016-01-192-0/+159
| |\
| | * Removing removing scripts and moving to python.Kenny Woodson2016-01-192-0/+159
* | | Merge pull request #1227 from openshift/masterMatt Woodson2016-01-193-0/+4
|\| |
| * | Merge pull request #1226 from mwoodson/zabbix_libsMatt Woodson2016-01-191-0/+1
| |\ \
| | * | oso_monitoring: add the zabbix libsMatt Woodson2016-01-191-0/+1
| |/ /
| * | Merge pull request #1225 from joelddiaz/disable-new-dnsJoel Diaz2016-01-192-0/+3
| |\ \
| | * | add ability to disable ztriggers and disable new container dns checkJoel Diaz2016-01-192-0/+3
* | | | Merge pull request #1222 from openshift/masterKenny Woodson2016-01-182-2/+8
|\| | |
| * | | Automatic commit of package [openshift-ansible] release [3.0.35-1].Brenton Leanhardt2016-01-182-2/+8
* | | | Merge pull request #1220 from openshift/masterMatt Woodson2016-01-189-1/+216
|\| | |
| * | | Merge pull request #1211 from abutcher/pacemaker-master-checkBrenton Leanhardt2016-01-181-1/+9
| |\ \ \
| | * | | Improve pacemaker 'is-active' check.Andrew Butcher2016-01-181-1/+9
| * | | | Merge pull request #1218 from mwoodson/chronyMatt Woodson2016-01-188-0/+207
| |\ \ \ \
| | * | | | added the lib_timedate roleMatt Woodson2016-01-184-4/+78
| | * | | | added chronyMatt Woodson2016-01-187-0/+133
* | | | | | Merge pull request #1214 from openshift/masterMatt Woodson2016-01-1862-250/+1127
|\| | | | |
| * | | | | Merge pull request #1212 from mwoodson/zagg_clientMatt Woodson2016-01-187-2/+97
| |\ \ \ \ \
| | * | | | | added oso_moniotoring tools roleMatt Woodson2016-01-187-2/+97
| | |/ / / /
| * | | | | Automatic commit of package [openshift-ansible] release [3.0.34-1].Brenton Leanhardt2016-01-182-2/+17
| * | | | | Merge pull request #1199 from smunilla/no_containerized_for_3.0Brenton Leanhardt2016-01-181-8/+7
| |\ \ \ \ \
| | * | | | | atomic-openshift-installer: Remove containerized install for 3.0Samuel Munilla2016-01-181-8/+7
| * | | | | | Merge pull request #1205 from smunilla/containerized_inventoryBrenton Leanhardt2016-01-181-0/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | atomic-openshift-installer: add containerized to inventorySamuel Munilla2016-01-181-0/+2
| | |/ / / /
| * | | | | Merge pull request #1210 from abutcher/nfs-utilsBrenton Leanhardt2016-01-181-0/+4
| |\ \ \ \ \
| | * | | | | Ensure nfs-utils installed for non-atomic hosts.Andrew Butcher2016-01-141-0/+4
| * | | | | | Merge pull request #1209 from joelddiaz/branchesJoel Diaz2016-01-181-56/+91
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | clean up too-many-branches / logicJoel Diaz2016-01-181-56/+91
| * | | | | Merge pull request #1204 from abutcher/restart-fixesBrenton Leanhardt2016-01-181-3/+3
| |\ \ \ \ \
| | * | | | | Add 'unknown' to possible output for the is-active check.Andrew Butcher2016-01-181-1/+1
| | * | | | | Fix cluster_method conditional in master restart playbook.Andrew Butcher2016-01-181-2/+2
| * | | | | | Merge pull request #1201 from donovanmuller/patch-2Brenton Leanhardt2016-01-181-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Use IdentityFile instead of PrivateKeyDonovan Muller2016-01-181-1/+1
| |/ / / / /
| * | | | | Merge pull request #1194 from abutcher/haproxy-restartBrenton Leanhardt2016-01-182-3/+3
| |\ \ \ \ \
| | * | | | | Remove pause after haproxy startAndrew Butcher2016-01-152-3/+3
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #1197 from donovanmuller/patch-1Brenton Leanhardt2016-01-181-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Host group should be OSEv3 not OSv3Donovan Muller2016-01-181-1/+1
| |/ / / /
| * | | | Automatic commit of package [openshift-ansible] release [3.0.33-1].Brenton Leanhardt2016-01-152-2/+11
| * | | | Merge pull request #1193 from abutcher/master-nodesBrenton Leanhardt2016-01-151-8/+38
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Configure nodes which are also masters prior to nodes in containerized install.Andrew Butcher2016-01-151-8/+38
| | |/ /
| * | | Merge pull request #1191 from abutcher/restart-promptBrenton Leanhardt2016-01-151-2/+4
| |\ \ \
| | * | | Call attention to openshift_master_rolling_restart_mode variable in restart p...Andrew Butcher2016-01-151-2/+4
| | |/ /
| * | | Merge pull request #1190 from twiest/prThomas Wiest2016-01-151-6/+12
| |\ \ \ | | |/ / | |/| |
| | * | Added anchors for rules in style_guide.adoc in order to make it easier to ref...Thomas Wiest2016-01-151-6/+12
| |/ /
| * | Merge pull request #1187 from detiber/ec2_nords_noelasticacheBrenton Leanhardt2016-01-141-2/+2
| |\ \
| | * | Update ec2.iniJason DeTiberus2016-01-141-2/+2
| * | | Automatic commit of package [openshift-ansible] release [3.0.32-1].Brenton Leanhardt2016-01-142-2/+5
| * | | Merge pull request #1186 from abutcher/uninstall-wrappersBrenton Leanhardt2016-01-141-0/+4
| |\ \ \
| | * | | Uninstall remove containerized wrapper and symlinksAndrew Butcher2016-01-141-0/+4
| * | | | Automatic commit of package [openshift-ansible] release [3.0.31-1].Brenton Leanhardt2016-01-142-2/+6