summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #564 from jtslear/minor-errorWesley Hearn2015-09-091-1/+1
|\ \
| * | Fix a minor bug involving AWS ENV KeysJohn T Skarbek2015-09-051-1/+1
* | | Merge pull request #567 from wshearn/update_master_sizeWesley Hearn2015-09-093-3/+3
|\ \ \
| * | | Default masters to t2.medium instead of t2.smallWesley Hearn2015-09-093-3/+3
|/ / /
* | | Merge pull request #548 from sdodson/jenkins-renameWesley Hearn2015-09-084-11/+21
|\ \ \ | |_|/ |/| |
| * | Jenkins image was renamedScott Dodson2015-09-014-11/+21
* | | Merge pull request #563 from sdodson/fix-recursive-loopBrenton Leanhardt2015-09-084-4/+4
|\ \ \ | |_|/ |/| |
| * | Avoid a recursive loopScott Dodson2015-09-044-4/+4
|/ /
* | Merge pull request #558 from sdodson/version-pinningBrenton Leanhardt2015-09-048-6/+12
|\ \
| * | Add openshift_version to set RPM versionsScott Dodson2015-09-038-6/+12
* | | Merge pull request #562 from mwoodson/triggersMatt Woodson2015-09-041-0/+5
|\ \ \
| * | | added mem.util.availableMatt Woodson2015-09-041-0/+5
* | | | Merge pull request #555 from umairmufti/issue-554Wesley Hearn2015-09-041-1/+4
|\ \ \ \
| * | | | Fix to ensure use_openshift_sdn is a boolean value.Umair Mufti2015-09-031-1/+4
* | | | | Merge pull request #561 from mmahut/urlMarek Mahut2015-09-043-0/+13
|\ \ \ \ \
| * | | | | Adding url to triggersMarek Mahut2015-09-043-0/+13
|/ / / / /
* | | | | Merge pull request #559 from kwoodson/tmpMatt Woodson2015-09-031-0/+1
|\ \ \ \ \
| * | | | | Added trigger urlKenny Woodson2015-09-031-0/+1
|/ / / / /
* | | | | Merge pull request #556 from mwoodson/triggersMatt Woodson2015-09-031-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | added url to the heartbeat checkMatt Woodson2015-09-031-0/+1
| |/ / /
* | | | Merge pull request #557 from kwoodson/triggerurlMatt Woodson2015-09-031-2/+16
|\ \ \ \ | |/ / / |/| | |
| * | | Adding url support for triggersKenny Woodson2015-09-031-2/+16
| |/ /
* | | Merge pull request #553 from detiber/vagrant_centosBrenton Leanhardt2015-09-031-5/+4
|\ \ \
| * | | Use official centos images for VagrantfileJason DeTiberus2015-09-031-5/+4
| |/ /
* | | Merge pull request #522 from dak1n1/master_scheduleStefanie Forrester2015-09-034-16/+25
|\ \ \ | |/ / |/| |
| * | added new node fact for schedulabilityStefanie Forrester2015-09-024-16/+25
|/ /
* | Merge pull request #544 from sdodson/serviceNetworkCIDRBrenton Leanhardt2015-09-024-1/+13
|\ \
| * | Add openshift_node_sdn_mtu configurationScott Dodson2015-09-023-1/+11
| * | Add serviceNetworkCIDR to network configScott Dodson2015-09-021-0/+2
| |/
* | Merge pull request #505 from dak1n1/waitfor_etcdStefanie Forrester2015-09-022-2/+8
|\ \
| * | wait for ports instead of waiting for an arbitrary period of timeStefanie Forrester2015-09-022-2/+8
| |/
* | Merge pull request #550 from twiest/prThomas Wiest2015-09-021-2/+2
|\ \ | |/ |/|
| * relaxed the docker metadata triggers to be more in line with what docker-stor...Thomas Wiest2015-09-021-2/+2
|/
* Merge pull request #546 from kwoodson/appfixMatt Woodson2015-09-014-65/+93
|\
| * Fix for zbx applicationsKenny Woodson2015-09-014-65/+93
|/
* Merge pull request #543 from mwoodson/triggersMatt Woodson2015-08-311-0/+25
|\
| * added monitoring triggersMatt Woodson2015-08-311-0/+8
| * added triggers for disk spaceMatt Woodson2015-08-311-0/+17
|/
* Merge pull request #541 from kwoodson/master_templKenny Woodson2015-08-312-0/+20
|\
| * Adding create appKenny Woodson2015-08-312-0/+20
* | Merge pull request #530 from sdodson/fix-hosts-fileBrenton Leanhardt2015-08-311-2/+4
|\ \ | |/ |/|
| * Make masters schedulable in byo exampleScott Dodson2015-08-311-2/+4
* | Merge pull request #539 from twiest/prKenny Woodson2015-08-3112-129/+133
|\ \ | |/ |/|
| * added docker zabbix template, removed unused / old templates so they don't co...Thomas Wiest2015-08-3112-129/+133
|/
* Merge pull request #533 from mwoodson/masterMatt Woodson2015-08-281-17/+2
|\
| * added filesys.fullMatt Woodson2015-08-281-17/+2
|/
* Merge pull request #512 from sdodson/nextWesley Hearn2015-08-2834-136/+208
|\
| * Atomic Enterprise related changes.Avesh Agarwal2015-08-2634-136/+208
* | Merge pull request #525 from cgwalters/tutorial-reset-no-imagesBrenton Leanhardt2015-08-281-0/+7
|\ \
| * | adhoc/tutorial_reset: Also delete etcd and dataColin Walters2015-08-271-0/+4