summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-10-02Merge pull request #651 from twiest/cprThomas Wiest
2015-10-02added Template Ops ToolsThomas Wiest
2015-10-02Merge pull request #650 from smunilla/masterBrenton Leanhardt
2015-10-02openshift_facts.py: Correct error case for uninstalled systemsSamuel Munilla
2015-10-01Merge pull request #639 from jaryn/localonly_dnsBrenton Leanhardt
2015-10-01Merge pull request #646 from smunilla/masterWesley Hearn
2015-10-01openshift_facts.py: Ansible fact for openshift versionSamuel Munilla
2015-10-01Merge pull request #644 from dak1n1/logrotateStefanie Forrester
2015-10-01added 'missingok' to logrotate and disabled fluentd in onlineStefanie Forrester
2015-10-01Merge pull request #643 from kwoodson/cputrigKenny Woodson
2015-10-01Adding trggers for cpu idleKenny Woodson
2015-09-30Merge pull request #640 from kwoodson/unitsKenny Woodson
2015-09-30Adding % to unitsKenny Woodson
2015-09-30Prevent dns resolution recursion (loop).Jaroslav Henner
2015-09-30Merge pull request #636 from kwoodson/quick1Kenny Woodson
2015-09-30Updating these to the correct typeKenny Woodson
2015-09-30Merge pull request #611 from wshearn/fix_product_typeWesley Hearn
2015-09-30Merge pull request #582 from sdodson/upgradesBrenton Leanhardt
2015-09-30Merge pull request #634 from abutcher/whats-nextBrenton Leanhardt
2015-09-30Point to advanced installation guide in READMEsAndrew Butcher
2015-09-29Merge pull request #630 from mwoodson/grow_docker_vgMatt Woodson
2015-09-29added pylint as a package to ansible-towerMatt Woodson
2015-09-29Merge pull request #629 from mwoodson/grow_docker_vgMatt Woodson
2015-09-29added comment to the grow_docker_vg playbookMatt Woodson
2015-09-29Merge pull request #628 from mwoodson/grow_docker_vgMatt Woodson
2015-09-29added the grow_docker_vg adhoc playbookMatt Woodson
2015-09-28Merge pull request #626 from kwoodson/quickMatt Woodson
2015-09-28Added some debug when zbxapi has an issueKenny Woodson
2015-09-28Merge pull request #625 from kwoodson/triggerprotoKenny Woodson
2015-09-28Merge pull request #624 from abutcher/merge-factsBrenton Leanhardt
2015-09-28Trigger prototype supportKenny Woodson
2015-09-28Merge pull request #613 from jaryn/patch-1Brenton Leanhardt
2015-09-28Only continue to merge facts if both old and new values are type dict.Andrew Butcher
2015-09-25Merge pull request #616 from kwoodson/tmp3Kenny Woodson
2015-09-25Updates to zbx_user_mediaKenny Woodson
2015-09-25Merge pull request #612 from kwoodson/zbx_actionKenny Woodson
2015-09-25Initial stab at zabbix actionsKenny Woodson
2015-09-25Merge pull request #615 from openshift/dynamic_filesystemMatt Woodson
2015-09-25added support for dynaic keys and items. added dynamic filesystems to zabbixMatt Woodson
2015-09-25Fix bullets in libvirt readmeJaroslav Henner
2015-09-24Merge pull request #590 from dak1n1/s3Stefanie Forrester
2015-09-24added dynamic inventory support for single-master clustersStefanie Forrester
2015-09-24Add missing ,Wesley Hearn
2015-09-23Added S3 docker-registry config scriptStefanie Forrester
2015-09-23UpgradesScott Dodson
2015-09-22Merge pull request #605 from kwoodson/tmp2Matt Woodson
2015-09-22Added descriptions and parameters required for associating prototypes to disc...Kenny Woodson
2015-09-22Merge pull request #603 from kwoodson/tmp1Matt Woodson
2015-09-22Fixed a bug and removed the need for template and discoveryruleKenny Woodson
2015-09-22Merge pull request #602 from kwoodson/tmp1Matt Woodson