summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Add missing ,Wesley Hearn2015-09-241-1/+1
* | | | | | | | Merge pull request #582 from sdodson/upgradesBrenton Leanhardt2015-09-3013-8/+153
|\ \ \ \ \ \ \ \
| * | | | | | | | UpgradesScott Dodson2015-09-2313-8/+153
* | | | | | | | | Merge pull request #634 from abutcher/whats-nextBrenton Leanhardt2015-09-303-46/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Point to advanced installation guide in READMEsAndrew Butcher2015-09-303-46/+11
|/ / / / / / / / /
* | | | | | | | | Merge pull request #630 from mwoodson/grow_docker_vgMatt Woodson2015-09-291-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | added pylint as a package to ansible-towerMatt Woodson2015-09-291-2/+1
* | | | | | | | | | Merge pull request #629 from mwoodson/grow_docker_vgMatt Woodson2015-09-291-0/+2
|\| | | | | | | | |
| * | | | | | | | | added comment to the grow_docker_vg playbookMatt Woodson2015-09-291-0/+2
* | | | | | | | | | Merge pull request #628 from mwoodson/grow_docker_vgMatt Woodson2015-09-292-0/+245
|\| | | | | | | | |
| * | | | | | | | | added the grow_docker_vg adhoc playbookMatt Woodson2015-09-292-0/+245
|/ / / / / / / / /
* | | | | | | | | Merge pull request #626 from kwoodson/quickMatt Woodson2015-09-281-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added some debug when zbxapi has an issueKenny Woodson2015-09-281-0/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #625 from kwoodson/triggerprotoKenny Woodson2015-09-284-1/+216
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Trigger prototype supportKenny Woodson2015-09-284-1/+216
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #624 from abutcher/merge-factsBrenton Leanhardt2015-09-281-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Only continue to merge facts if both old and new values are type dict.Andrew Butcher2015-09-281-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #613 from jaryn/patch-1Brenton Leanhardt2015-09-281-1/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix bullets in libvirt readmeJaroslav Henner2015-09-251-1/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #616 from kwoodson/tmp3Kenny Woodson2015-09-251-9/+44
|\ \ \ \ \ \ \
| * | | | | | | Updates to zbx_user_mediaKenny Woodson2015-09-251-9/+44
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #612 from kwoodson/zbx_actionKenny Woodson2015-09-251-0/+538
|\ \ \ \ \ \ \
| * | | | | | | Initial stab at zabbix actionsKenny Woodson2015-09-251-0/+538
| |/ / / / / /
* | | | | | | Merge pull request #615 from openshift/dynamic_filesystemMatt Woodson2015-09-252-0/+46
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | added support for dynaic keys and items. added dynamic filesystems to zabbixMatt Woodson2015-09-252-0/+46
|/ / / / / /
* | | | | | Merge pull request #590 from dak1n1/s3Stefanie Forrester2015-09-242-0/+70
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | added dynamic inventory support for single-master clustersStefanie Forrester2015-09-242-11/+6
| * | | | | Added S3 docker-registry config scriptStefanie Forrester2015-09-232-0/+75
|/ / / / /
* | | | | Merge pull request #605 from kwoodson/tmp2Matt Woodson2015-09-222-4/+11
|\ \ \ \ \
| * | | | | Added descriptions and parameters required for associating prototypes to disc...Kenny Woodson2015-09-222-4/+11
|/ / / / /
* | | | | Merge pull request #603 from kwoodson/tmp1Matt Woodson2015-09-222-9/+5
|\ \ \ \ \
| * | | | | Fixed a bug and removed the need for template and discoveryruleKenny Woodson2015-09-222-9/+5
* | | | | | Merge pull request #602 from kwoodson/tmp1Matt Woodson2015-09-222-16/+76
|\| | | | | | |/ / / / |/| | | |
| * | | | Fixed a few bugs and added support for prototypes and discoveryrules.Kenny Woodson2015-09-222-16/+76
|/ / / /
* | | | Merge pull request #598 from mwoodson/cleanupMatt Woodson2015-09-211-4/+3
|\ \ \ \
| * | | | changed the docker cleanup to exclude certain registriesMatt Woodson2015-09-211-4/+3
|/ / / /
* | | | Merge pull request #597 from mwoodson/cleanupMatt Woodson2015-09-211-3/+4
|\ \ \ \
| * | | | commented out dangerous playbook option for cleanupMatt Woodson2015-09-211-3/+4
|/ / / /
* | | | Merge pull request #595 from sdodson/v106-changesBrenton Leanhardt2015-09-181-5/+1
|\ \ \ \
| * | | | Update origin paths for v1.0.6Scott Dodson2015-09-181-5/+1
| | |/ / | |/| |
* | | | Merge pull request #594 from mwoodson/docker_loopbackMatt Woodson2015-09-182-2/+78
|\ \ \ \
| * | | | added playbook for docker storage cleanupMatt Woodson2015-09-182-2/+78
* | | | | Merge pull request #593 from mwoodson/docker_loopbackMatt Woodson2015-09-181-2/+5
|\| | | |
| * | | | cleaned up some errors in loopback playbookMatt Woodson2015-09-181-2/+5
* | | | | Merge pull request #592 from mwoodson/docker_loopbackMatt Woodson2015-09-182-0/+143
|\| | | |
| * | | | added the docker loopback fixer scriptMatt Woodson2015-09-182-0/+143
|/ / / /
* | | | Merge pull request #588 from twiest/prThomas Wiest2015-09-173-0/+46
|\ \ \ \ | |/ / / |/| | |
| * | | Added zabbix item openshift.master.process.exist and trigger to watch it.Thomas Wiest2015-09-173-0/+46
|/ / /
* | | Merge pull request #569 from dak1n1/service_accountsStefanie Forrester2015-09-113-0/+39
|\ \ \
| * | | Create service accounts and set up scc rulesStefanie Forrester2015-09-103-0/+39