Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #674 from kwoodson/zabagent | Kenny Woodson | 2015-10-08 | 3 | -0/+34 |
|\ | |||||
| * | Adding zabbix agent template | Kenny Woodson | 2015-10-08 | 3 | -0/+34 |
* | | Merge pull request #655 from stenwt/sturpin-2015-10-01-running-pods | Sten Turpin | 2015-10-08 | 1 | -0/+6 |
|\ \ | |||||
| * | | fixed spacing | Sten Turpin | 2015-10-08 | 1 | -5/+5 |
| * | | added running pods | Sten Turpin | 2015-10-08 | 1 | -0/+6 |
|/ / | |||||
* | | Merge pull request #672 from kwoodson/zbxmediafix | Kenny Woodson | 2015-10-08 | 1 | -0/+3 |
|\ \ | |||||
| * | | Fixed user media bug where we would update media when we really wanted to cre... | Kenny Woodson | 2015-10-08 | 1 | -0/+3 |
* | | | removed static xvda checks | Matt Woodson | 2015-10-08 | 1 | -32/+0 |
| |/ |/| | |||||
* | | Merge pull request #633 from robotmaxtron/mwhittin-cluster-user-count | Thomas Wiest | 2015-10-08 | 1 | -0/+12 |
|\ \ | |||||
| * | | Changed trigger to only info alert if users is at 0 | Max Whittingham | 2015-10-05 | 1 | -1/+1 |
| * | | Zabbix check and trigger for user count | Max Whittingham | 2015-09-30 | 1 | -0/+12 |
* | | | Merge pull request #669 from kwoodson/protofix | Matt Woodson | 2015-10-07 | 1 | -3/+3 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fixed a bug where applicationids were not being filtered properly | Kenny Woodson | 2015-10-07 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #668 from kwoodson/quick2 | Kenny Woodson | 2015-10-07 | 3 | -0/+441 |
|\ \ | |||||
| * | | Zabbix server template added | Kenny Woodson | 2015-10-07 | 3 | -0/+441 |
|/ / | |||||
* | | Merge pull request #660 from sdodson/updated-registry-facts | Brenton Leanhardt | 2015-10-07 | 1 | -4/+4 |
|\ \ | |||||
| * | | Updated registry fact with latest deployment_type mappings | Scott Dodson | 2015-10-06 | 1 | -4/+4 |
* | | | Merge pull request #638 from jaryn/patch-2 | Brenton Leanhardt | 2015-10-07 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | Fix newline | Jaroslav Henner | 2015-09-30 | 1 | -1/+2 |
* | | | | Merge pull request #667 from kwoodson/loopback | Kenny Woodson | 2015-10-07 | 1 | -7/+0 |
|\ \ \ \ | |||||
| * | | | | Removing the last step as it will fail. | Kenny Woodson | 2015-10-07 | 1 | -7/+0 |
* | | | | | Merge pull request #666 from kwoodson/loopback | Matt Woodson | 2015-10-07 | 1 | -3/+1 |
|\| | | | | |||||
| * | | | | Removed io1 type for gp2 | Kenny Woodson | 2015-10-07 | 1 | -3/+1 |
* | | | | | Merge pull request #657 from liggitt/scheduler | Brenton Leanhardt | 2015-10-06 | 1 | -0/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Add kind/apiVersion to scheduler.json template | Jordan Liggitt | 2015-10-05 | 1 | -0/+2 |
* | | | | | Merge pull request #653 from arsogukpinar/master | Brenton Leanhardt | 2015-10-06 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix for name conflict | Ali Sogukpinar | 2015-10-05 | 1 | -2/+2 |
* | | | | | Merge pull request #654 from openshift/revert-641-gce-support | Thomas Wiest | 2015-10-05 | 16 | -211/+80 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Revert "GCE support" | Thomas Wiest | 2015-10-05 | 16 | -211/+80 |
|/ / / / | |||||
* | | | | Merge pull request #641 from menren/gce-support | Thomas Wiest | 2015-10-05 | 16 | -80/+211 |
|\ \ \ \ | |||||
| * | | | | openshift master public api url defaults to None, it will get its default val... | Chengcheng Mu | 2015-10-02 | 3 | -31/+32 |
| * | | | | Removed some application specific code like insecure registries, heat template | Chengcheng Mu | 2015-10-01 | 3 | -24/+3 |
| * | | | | oo_option fixed, some clean up | Chengcheng Mu | 2015-10-01 | 4 | -31/+3 |
| * | | | | Rebased on master | Chengcheng Mu | 2015-10-01 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * | | | | fixed some issues to boot VM on GCE | Chengcheng Mu | 2015-10-01 | 40 | -140/+401 |
| * | | | | | GCE-support (more information in PR, README_GCE.md) | Chengcheng Mu | 2015-10-01 | 18 | -55/+234 |
* | | | | | | Merge pull request #651 from twiest/cpr | Thomas Wiest | 2015-10-02 | 4 | -5/+38 |
|\ \ \ \ \ \ | |||||
| * | | | | | | added Template Ops Tools | Thomas Wiest | 2015-10-02 | 4 | -5/+38 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #650 from smunilla/master | Brenton Leanhardt | 2015-10-02 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | openshift_facts.py: Correct error case for uninstalled systems | Samuel Munilla | 2015-10-02 | 1 | -0/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #639 from jaryn/localonly_dns | Brenton Leanhardt | 2015-10-01 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Prevent dns resolution recursion (loop). | Jaroslav Henner | 2015-09-30 | 1 | -1/+1 |
* | | | | | | | Merge pull request #646 from smunilla/master | Wesley Hearn | 2015-10-01 | 1 | -0/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | openshift_facts.py: Ansible fact for openshift version | Samuel Munilla | 2015-10-01 | 1 | -0/+14 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #644 from dak1n1/logrotate | Stefanie Forrester | 2015-10-01 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | added 'missingok' to logrotate and disabled fluentd in online | Stefanie Forrester | 2015-10-01 | 2 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #643 from kwoodson/cputrig | Kenny Woodson | 2015-10-01 | 1 | -0/+15 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Adding trggers for cpu idle | Kenny Woodson | 2015-10-01 | 1 | -0/+15 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #640 from kwoodson/units | Kenny Woodson | 2015-09-30 | 1 | -0/+8 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Adding % to units | Kenny Woodson | 2015-09-30 | 1 | -0/+8 |
|/ / / / / |