summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #643 from kwoodson/cputrigKenny Woodson2015-10-011-0/+15
|\
| * Adding trggers for cpu idleKenny Woodson2015-10-011-0/+15
|/
* Merge pull request #640 from kwoodson/unitsKenny Woodson2015-09-301-0/+8
|\
| * Adding % to unitsKenny Woodson2015-09-301-0/+8
|/
* Merge pull request #636 from kwoodson/quick1Kenny Woodson2015-09-301-8/+8
|\
| * Updating these to the correct typeKenny Woodson2015-09-301-8/+8
|/
* Merge pull request #611 from wshearn/fix_product_typeWesley Hearn2015-09-301-1/+1
|\
| * 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
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 11:49:46 +0000