summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #635 from abutcher/bz1258243Brenton Leanhardt2015-10-092-4/+4
|\
| * Use lower() filter for node hostnameAndrew Butcher2015-10-082-4/+4
* | Merge pull request #677 from stenwt/sturpin-2015-10-08-ovs-monitorSten Turpin2015-10-082-24/+26
|\ \
| * | moved vswitch from master to nodeSten Turpin2015-10-082-24/+26
* | | Merge pull request #676 from stenwt/sturpin-2015-10-08-ovs-monitorSten Turpin2015-10-081-1/+1
|\| |
| * | fixed not equals syntaxSten Turpin2015-10-081-1/+1
* | | Merge pull request #675 from stenwt/sturpin-2015-10-08-ovs-monitorSten Turpin2015-10-081-0/+22
|\| |
| * | added items + triggers for ovs testsSten Turpin2015-10-081-0/+22
* | | Merge pull request #674 from kwoodson/zabagentKenny Woodson2015-10-083-0/+34
|\ \ \ | |/ / |/| |
| * | Adding zabbix agent templateKenny Woodson2015-10-083-0/+34
* | | Merge pull request #655 from stenwt/sturpin-2015-10-01-running-podsSten Turpin2015-10-081-0/+6
|\ \ \
| * | | fixed spacingSten Turpin2015-10-081-5/+5
| * | | added running podsSten Turpin2015-10-081-0/+6
|/ / /
* | | Merge pull request #672 from kwoodson/zbxmediafixKenny Woodson2015-10-081-0/+3
|\ \ \
| * | | Fixed user media bug where we would update media when we really wanted to cre...Kenny Woodson2015-10-081-0/+3
* | | | removed static xvda checksMatt Woodson2015-10-081-32/+0
| |/ / |/| |
* | | Merge pull request #633 from robotmaxtron/mwhittin-cluster-user-countThomas Wiest2015-10-081-0/+12
|\ \ \
| * | | Changed trigger to only info alert if users is at 0Max Whittingham2015-10-051-1/+1
| * | | Zabbix check and trigger for user countMax Whittingham2015-09-301-0/+12
* | | | Merge pull request #669 from kwoodson/protofixMatt Woodson2015-10-071-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixed a bug where applicationids were not being filtered properlyKenny Woodson2015-10-071-3/+3
|/ / /
* | | Merge pull request #668 from kwoodson/quick2Kenny Woodson2015-10-073-0/+441
|\ \ \
| * | | Zabbix server template addedKenny Woodson2015-10-073-0/+441
|/ / /
* | | Merge pull request #660 from sdodson/updated-registry-factsBrenton Leanhardt2015-10-071-4/+4
|\ \ \
| * | | Updated registry fact with latest deployment_type mappingsScott Dodson2015-10-061-4/+4
* | | | Merge pull request #638 from jaryn/patch-2Brenton Leanhardt2015-10-071-1/+2
|\ \ \ \
| * | | | Fix newlineJaroslav Henner2015-09-301-1/+2
* | | | | Merge pull request #667 from kwoodson/loopbackKenny Woodson2015-10-071-7/+0
|\ \ \ \ \
| * | | | | Removing the last step as it will fail.Kenny Woodson2015-10-071-7/+0
* | | | | | Merge pull request #666 from kwoodson/loopbackMatt Woodson2015-10-071-3/+1
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | Removed io1 type for gp2Kenny Woodson2015-10-071-3/+1
* | | | | Merge pull request #657 from liggitt/schedulerBrenton Leanhardt2015-10-061-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add kind/apiVersion to scheduler.json templateJordan Liggitt2015-10-051-0/+2
* | | | | Merge pull request #653 from arsogukpinar/masterBrenton Leanhardt2015-10-061-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix for name conflictAli Sogukpinar2015-10-051-2/+2
* | | | | Merge pull request #654 from openshift/revert-641-gce-supportThomas Wiest2015-10-0516-211/+80
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert "GCE support"Thomas Wiest2015-10-0516-211/+80
|/ / / /
* | | | Merge pull request #641 from menren/gce-supportThomas Wiest2015-10-0516-80/+211
|\ \ \ \
| * | | | openshift master public api url defaults to None, it will get its default val...Chengcheng Mu2015-10-023-31/+32
| * | | | Removed some application specific code like insecure registries, heat templateChengcheng Mu2015-10-013-24/+3
| * | | | oo_option fixed, some clean upChengcheng Mu2015-10-014-31/+3
| * | | | Rebased on masterChengcheng Mu2015-10-010-0/+0
| |\ \ \ \
| | * | | | fixed some issues to boot VM on GCEChengcheng Mu2015-10-0140-140/+401
| * | | | | GCE-support (more information in PR, README_GCE.md)Chengcheng Mu2015-10-0118-55/+234
* | | | | | Merge pull request #651 from twiest/cprThomas Wiest2015-10-024-5/+38
|\ \ \ \ \ \
| * | | | | | added Template Ops ToolsThomas Wiest2015-10-024-5/+38
|/ / / / / /
* | | | | | Merge pull request #650 from smunilla/masterBrenton Leanhardt2015-10-021-0/+2
|\ \ \ \ \ \
| * | | | | | openshift_facts.py: Correct error case for uninstalled systemsSamuel Munilla2015-10-021-0/+2
|/ / / / / /
* | | | | | Merge pull request #639 from jaryn/localonly_dnsBrenton Leanhardt2015-10-011-1/+1
|\ \ \ \ \ \
| * | | | | | Prevent dns resolution recursion (loop).Jaroslav Henner2015-09-301-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 10:32:40 +0000