| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | Merge pull request #624 from abutcher/merge-facts | Brenton Leanhardt | 2015-09-28 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
| | | * | | | | | | | | Only continue to merge facts if both old and new values are type dict. | Andrew Butcher | 2015-09-28 | 1 | -1/+1 | |
| | | |/ / / / / / / | ||||||
| | * | | | | | | | | Merge pull request #613 from jaryn/patch-1 | Brenton Leanhardt | 2015-09-28 | 1 | -1/+6 | |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | | * | | | | | | | Fix bullets in libvirt readme | Jaroslav Henner | 2015-09-25 | 1 | -1/+6 | |
| | | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | | Merge pull request #616 from kwoodson/tmp3 | Kenny Woodson | 2015-09-25 | 1 | -9/+44 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Updates to zbx_user_media | Kenny Woodson | 2015-09-25 | 1 | -9/+44 | |
| | | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | | Merge pull request #612 from kwoodson/zbx_action | Kenny Woodson | 2015-09-25 | 1 | -0/+538 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Initial stab at zabbix actions | Kenny Woodson | 2015-09-25 | 1 | -0/+538 | |
| | | |/ / / / / / | ||||||
| | * | | | | | | | Merge pull request #615 from openshift/dynamic_filesystem | Matt Woodson | 2015-09-25 | 2 | -0/+46 | |
| | |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | ||||||
| | | * | | | | | | added support for dynaic keys and items. added dynamic filesystems to zabbix | Matt Woodson | 2015-09-25 | 2 | -0/+46 | |
| | |/ / / / / / | ||||||
| | * | | | | | | Merge pull request #590 from dak1n1/s3 | Stefanie Forrester | 2015-09-24 | 2 | -0/+70 | |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | | * | | | | | added dynamic inventory support for single-master clusters | Stefanie Forrester | 2015-09-24 | 2 | -11/+6 | |
| | | * | | | | | Added S3 docker-registry config script | Stefanie Forrester | 2015-09-23 | 2 | -0/+75 | |
| | |/ / / / / | ||||||
| | * | | | | | Merge pull request #605 from kwoodson/tmp2 | Matt Woodson | 2015-09-22 | 2 | -4/+11 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Added descriptions and parameters required for associating prototypes to disc... | Kenny Woodson | 2015-09-22 | 2 | -4/+11 | |
| | |/ / / / / | ||||||
| | * | | | | | Merge pull request #603 from kwoodson/tmp1 | Matt Woodson | 2015-09-22 | 2 | -9/+5 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Fixed a bug and removed the need for template and discoveryrule | Kenny Woodson | 2015-09-22 | 2 | -9/+5 | |
| | * | | | | | | Merge pull request #602 from kwoodson/tmp1 | Matt Woodson | 2015-09-22 | 2 | -16/+76 | |
| | |\| | | | | | | |/ / / / | |/| | | | | ||||||
| | | * | | | | Fixed a few bugs and added support for prototypes and discoveryrules. | Kenny Woodson | 2015-09-22 | 2 | -16/+76 | |
| | |/ / / / | ||||||
| | * | | | | Merge pull request #598 from mwoodson/cleanup | Matt Woodson | 2015-09-21 | 1 | -4/+3 | |
| | |\ \ \ \ | ||||||
| | | * | | | | changed the docker cleanup to exclude certain registries | Matt Woodson | 2015-09-21 | 1 | -4/+3 | |
| | |/ / / / | ||||||
| | * | | | | Merge pull request #597 from mwoodson/cleanup | Matt Woodson | 2015-09-21 | 1 | -3/+4 | |
| | |\ \ \ \ | ||||||
| | | * | | | | commented out dangerous playbook option for cleanup | Matt Woodson | 2015-09-21 | 1 | -3/+4 | |
| | |/ / / / | ||||||
| | * | | | | Merge pull request #595 from sdodson/v106-changes | Brenton Leanhardt | 2015-09-18 | 1 | -5/+1 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Update origin paths for v1.0.6 | Scott Dodson | 2015-09-18 | 1 | -5/+1 | |
| | | | |/ / | | |/| | | ||||||
| | * | | | | Merge pull request #594 from mwoodson/docker_loopback | Matt Woodson | 2015-09-18 | 2 | -2/+78 | |
| | |\ \ \ \ | ||||||
| | | * | | | | added playbook for docker storage cleanup | Matt Woodson | 2015-09-18 | 2 | -2/+78 | |
| | * | | | | | Merge pull request #593 from mwoodson/docker_loopback | Matt Woodson | 2015-09-18 | 1 | -2/+5 | |
| | |\| | | | | ||||||
| | | * | | | | cleaned up some errors in loopback playbook | Matt Woodson | 2015-09-18 | 1 | -2/+5 | |
| | * | | | | | Merge pull request #592 from mwoodson/docker_loopback | Matt Woodson | 2015-09-18 | 2 | -0/+143 | |
| | |\| | | | | ||||||
| | | * | | | | added the docker loopback fixer script | Matt Woodson | 2015-09-18 | 2 | -0/+143 | |
| | |/ / / / | ||||||
| | * | | | | Merge pull request #588 from twiest/pr | Thomas Wiest | 2015-09-17 | 3 | -0/+46 | |
| | |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | | * | | | Added zabbix item openshift.master.process.exist and trigger to watch it. | Thomas Wiest | 2015-09-17 | 3 | -0/+46 | |
| | |/ / / | ||||||
| | * | | | Merge pull request #569 from dak1n1/service_accounts | Stefanie Forrester | 2015-09-11 | 3 | -0/+39 | |
| | |\ \ \ | ||||||
| | | * | | | Create service accounts and set up scc rules | Stefanie Forrester | 2015-09-10 | 3 | -0/+39 | |
| | * | | | | Merge pull request #577 from kwoodson/tmp | Matt Woodson | 2015-09-11 | 2 | -4/+4 | |
| | |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | | * | | | Fixes for zbx api | Kenny Woodson | 2015-09-11 | 2 | -4/+4 | |
| | |/ / / | ||||||
| | * | | | Merge pull request #570 from sdodson/openshift_data_dir | Brenton Leanhardt | 2015-09-10 | 4 | -4/+11 | |
| | |\ \ \ | ||||||
| | | * | | | Move openshift_data_dir to a fact based on deployment_type | Scott Dodson | 2015-09-10 | 4 | -4/+11 | |
| | * | | | | Merge pull request #574 from openshift/mem_items | Matt Woodson | 2015-09-10 | 4 | -57/+81 | |
| | |\ \ \ \ | ||||||
| | | * | | | | updated triggers and items to have better descriptions and multipliers | Matt Woodson | 2015-09-10 | 4 | -57/+81 | |
| | * | | | | | Merge pull request #573 from kwoodson/triggerfix | Kenny Woodson | 2015-09-10 | 2 | -5/+8 | |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | | * | | | | Adding capability to have descriptions on triggers | Kenny Woodson | 2015-09-10 | 2 | -5/+8 | |
| | |/ / / / | ||||||
| | * | | | | Merge pull request #566 from kwoodson/item_fix | Matt Woodson | 2015-09-10 | 3 | -2/+40 | |
| | |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | | * | | | Adding desc, multiplier, and units to zabbix item | Kenny Woodson | 2015-09-08 | 3 | -2/+40 | |
| | * | | | | Merge pull request #564 from jtslear/minor-error | Wesley Hearn | 2015-09-09 | 1 | -1/+1 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Fix a minor bug involving AWS ENV Keys | John T Skarbek | 2015-09-05 | 1 | -1/+1 | |
| | | | |/ / | | |/| | | ||||||
| | * | | | | Merge pull request #567 from wshearn/update_master_size | Wesley Hearn | 2015-09-09 | 3 | -3/+3 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Default masters to t2.medium instead of t2.small | Wesley Hearn | 2015-09-09 | 3 | -3/+3 | |
| | |/ / / / | ||||||
| | * | | | | Merge pull request #548 from sdodson/jenkins-rename | Wesley Hearn | 2015-09-08 | 4 | -11/+21 | |
| | |\ \ \ \ | | |_|/ / | |/| | | | ||||||
 |
index : csa/devops/ansible-patches/openshift.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |