summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1316 from mwoodson/master_localMatt Woodson2016-02-011-2/+25
|\
| * zabbix: added master local api items and triggersMatt Woodson2016-02-011-2/+25
* | Merge pull request #1304 from jprovaznik/sleepBrenton Leanhardt2016-02-011-0/+1
|\ \ | |/ |/|
| * Give openvswitch container some time to startJan Provaznik2016-01-291-0/+1
* | Merge pull request #1311 from sdodson/is-syncBrenton Leanhardt2016-02-015-109/+123
|\ \
| * | Fix missing bool filterScott Dodson2016-01-291-1/+1
| * | Sync platest imagestreamsScott Dodson2016-01-294-108/+122
* | | Automatic commit of package [openshift-ansible] release [3.0.37-1].Kenny Woodson2016-01-292-2/+36
* | | Merge pull request #1313 from kwoodson/ohi_ipsKenny Woodson2016-01-294-16/+52
|\ \ \
| * | | Adding ip address optionKenny Woodson2016-01-294-16/+52
| |/ /
* | | Merge pull request #1114 from lhuard1A/fix_update_repos_and_packagesBrenton Leanhardt2016-01-293-2/+4
|\ \ \
| * | | Move the `is_atomic` check from `update_repos_and_packages.yml` to `rhel_subs...Lénaïc Huard2016-01-123-2/+4
* | | | Merge pull request #1133 from lhuard1A/increase_openstack_timeoutBrenton Leanhardt2016-01-292-2/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Increase OpenStack stack creation/deletion timeoutLénaïc Huard2016-01-082-2/+3
* | | | Merge pull request #1300 from vishpat/bug1298Brenton Leanhardt2016-01-291-0/+1
|\ \ \ \
| * | | | Fix for bug 1298Vishal Patil2016-01-281-0/+1
| | |_|/ | |/| |
* | | | Merge pull request #1307 from abutcher/containerized-cockpitBrenton Leanhardt2016-01-291-1/+1
|\ \ \ \
| * | | | Enable cockpit when not is_atomic.Andrew Butcher2016-01-291-1/+1
| |/ / /
* | | | Merge pull request #1301 from vishpat/bug1299Brenton Leanhardt2016-01-291-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Explicitly restart the atomic node service after configuring it for nuageVishal Patil2016-01-281-0/+4
|/ / /
* | | Merge pull request #1264 from gaelL/s3_registry_templateStefanie Forrester2016-01-281-0/+3
|\ \ \
| * | | adhoc s3 registry - add auth part in the registry config samplegaelL2016-01-221-0/+3
* | | | Merge pull request #1265 from talset/s3_registry_clusteridStefanie Forrester2016-01-282-4/+6
|\ \ \ \
| * | | | Allow to have custom bucket name and regiontalset2016-01-282-4/+6
| |/ / /
* | | | Merge pull request #1288 from abutcher/container-logrotateBrenton Leanhardt2016-01-287-3/+13
|\ \ \ \
| * | | | Add inventory example for logrotate_scriptsAndrew Butcher2016-01-283-0/+12
| * | | | Configure logrotate on atomic.Andrew Butcher2016-01-274-3/+1
* | | | | Merge pull request #1294 from kwoodson/yaml_fixKenny Woodson2016-01-281-1/+6
|\ \ \ \ \
| * | | | | fixing logic for skipping symlinksKenny Woodson2016-01-281-1/+6
|/ / / / /
* | | | | Merge pull request #1290 from joelddiaz/sky-templateJoel Diaz2016-01-281-2/+2
|\ \ \ \ \
| * | | | | fix template trigger calcJoel Diaz2016-01-281-2/+2
| |/ / / /
* | | | | Merge pull request #1292 from brenton/masterBrenton Leanhardt2016-01-281-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Minor readme cleanup for Bug 1271566Brenton Leanhardt2016-01-281-3/+3
|/ / / /
* | | | Merge pull request #1286 from kwoodson/zbx_host_fixKenny Woodson2016-01-261-1/+20
|\ \ \ \
| * | | | Comparing zbx_host interfaces and removing duplicate hostgroup_namesKenny Woodson2016-01-261-1/+20
* | | | | Merge pull request #1273 from lhuard1A/fix_oo_pretty_print_clusterThomas Wiest2016-01-261-19/+21
|\ \ \ \ \
| * | | | | Fix oo_pretty_print_cluster following the renaming of `env` into `clusterid`Lénaïc Huard2016-01-261-19/+21
* | | | | | Merge pull request #1274 from rassie/patch-1Brenton Leanhardt2016-01-261-2/+2
|\ \ \ \ \ \
| * | | | | | Fix checking for update package availabilityNikolai Prokoschenko2016-01-261-2/+2
* | | | | | | Merge pull request #1283 from giuseppe/giuseppe/Dockerfile-require-pyOpenSSLBrenton Leanhardt2016-01-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Dockerfile: Require pyOpenSSLGiuseppe Scrivano2016-01-261-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #1280 from sjenning/replace-yum-dnfBrenton Leanhardt2016-01-261-1/+1
|\ \ \ \ \ \ \
| * | | | | | | replace yum with dnfSeth Jennings2016-01-261-1/+1
* | | | | | | | Merge pull request #1279 from abutcher/is-atomic-swapBrenton Leanhardt2016-01-266-9/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Install cockpit, logrotate and fluentd unless host is atomic.Andrew Butcher2016-01-266-9/+8
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #1275 from spinolacastro/datadirBrenton Leanhardt2016-01-261-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Expose data_dirDiego Castro2016-01-261-0/+1
* | | | | | | | Merge pull request #1270 from detiber/opensslBrenton Leanhardt2016-01-261-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure openssl present for etcd_caJason DeTiberus2016-01-251-0/+4
* | | | | | | | | Merge pull request #1276 from spinolacastro/pkgversionBrenton Leanhardt2016-01-261-0/+1
|\ \ \ \ \ \ \ \ \