Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1316 from mwoodson/master_local | Matt Woodson | 2016-02-01 | 1 | -2/+25 |
|\ | |||||
| * | zabbix: added master local api items and triggers | Matt Woodson | 2016-02-01 | 1 | -2/+25 |
* | | Merge pull request #1304 from jprovaznik/sleep | Brenton Leanhardt | 2016-02-01 | 1 | -0/+1 |
|\ \ | |/ |/| | |||||
| * | Give openvswitch container some time to start | Jan Provaznik | 2016-01-29 | 1 | -0/+1 |
* | | Merge pull request #1311 from sdodson/is-sync | Brenton Leanhardt | 2016-02-01 | 5 | -109/+123 |
|\ \ | |||||
| * | | Fix missing bool filter | Scott Dodson | 2016-01-29 | 1 | -1/+1 |
| * | | Sync platest imagestreams | Scott Dodson | 2016-01-29 | 4 | -108/+122 |
* | | | Automatic commit of package [openshift-ansible] release [3.0.37-1]. | Kenny Woodson | 2016-01-29 | 2 | -2/+36 |
* | | | Merge pull request #1313 from kwoodson/ohi_ips | Kenny Woodson | 2016-01-29 | 4 | -16/+52 |
|\ \ \ | |||||
| * | | | Adding ip address option | Kenny Woodson | 2016-01-29 | 4 | -16/+52 |
| |/ / | |||||
* | | | Merge pull request #1114 from lhuard1A/fix_update_repos_and_packages | Brenton Leanhardt | 2016-01-29 | 3 | -2/+4 |
|\ \ \ | |||||
| * | | | Move the `is_atomic` check from `update_repos_and_packages.yml` to `rhel_subs... | Lénaïc Huard | 2016-01-12 | 3 | -2/+4 |
* | | | | Merge pull request #1133 from lhuard1A/increase_openstack_timeout | Brenton Leanhardt | 2016-01-29 | 2 | -2/+3 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Increase OpenStack stack creation/deletion timeout | Lénaïc Huard | 2016-01-08 | 2 | -2/+3 |
* | | | | Merge pull request #1300 from vishpat/bug1298 | Brenton Leanhardt | 2016-01-29 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Fix for bug 1298 | Vishal Patil | 2016-01-28 | 1 | -0/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1307 from abutcher/containerized-cockpit | Brenton Leanhardt | 2016-01-29 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Enable cockpit when not is_atomic. | Andrew Butcher | 2016-01-29 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1301 from vishpat/bug1299 | Brenton Leanhardt | 2016-01-29 | 1 | -0/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Explicitly restart the atomic node service after configuring it for nuage | Vishal Patil | 2016-01-28 | 1 | -0/+4 |
|/ / / | |||||
* | | | Merge pull request #1264 from gaelL/s3_registry_template | Stefanie Forrester | 2016-01-28 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | adhoc s3 registry - add auth part in the registry config sample | gaelL | 2016-01-22 | 1 | -0/+3 |
* | | | | Merge pull request #1265 from talset/s3_registry_clusterid | Stefanie Forrester | 2016-01-28 | 2 | -4/+6 |
|\ \ \ \ | |||||
| * | | | | Allow to have custom bucket name and region | talset | 2016-01-28 | 2 | -4/+6 |
| |/ / / | |||||
* | | | | Merge pull request #1288 from abutcher/container-logrotate | Brenton Leanhardt | 2016-01-28 | 7 | -3/+13 |
|\ \ \ \ | |||||
| * | | | | Add inventory example for logrotate_scripts | Andrew Butcher | 2016-01-28 | 3 | -0/+12 |
| * | | | | Configure logrotate on atomic. | Andrew Butcher | 2016-01-27 | 4 | -3/+1 |
* | | | | | Merge pull request #1294 from kwoodson/yaml_fix | Kenny Woodson | 2016-01-28 | 1 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | fixing logic for skipping symlinks | Kenny Woodson | 2016-01-28 | 1 | -1/+6 |
|/ / / / / | |||||
* | | | | | Merge pull request #1290 from joelddiaz/sky-template | Joel Diaz | 2016-01-28 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | fix template trigger calc | Joel Diaz | 2016-01-28 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #1292 from brenton/master | Brenton Leanhardt | 2016-01-28 | 1 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Minor readme cleanup for Bug 1271566 | Brenton Leanhardt | 2016-01-28 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | Merge pull request #1286 from kwoodson/zbx_host_fix | Kenny Woodson | 2016-01-26 | 1 | -1/+20 |
|\ \ \ \ | |||||
| * | | | | Comparing zbx_host interfaces and removing duplicate hostgroup_names | Kenny Woodson | 2016-01-26 | 1 | -1/+20 |
* | | | | | Merge pull request #1273 from lhuard1A/fix_oo_pretty_print_cluster | Thomas Wiest | 2016-01-26 | 1 | -19/+21 |
|\ \ \ \ \ | |||||
| * | | | | | Fix oo_pretty_print_cluster following the renaming of `env` into `clusterid` | Lénaïc Huard | 2016-01-26 | 1 | -19/+21 |
* | | | | | | Merge pull request #1274 from rassie/patch-1 | Brenton Leanhardt | 2016-01-26 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix checking for update package availability | Nikolai Prokoschenko | 2016-01-26 | 1 | -2/+2 |
* | | | | | | | Merge pull request #1283 from giuseppe/giuseppe/Dockerfile-require-pyOpenSSL | Brenton Leanhardt | 2016-01-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Dockerfile: Require pyOpenSSL | Giuseppe Scrivano | 2016-01-26 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #1280 from sjenning/replace-yum-dnf | Brenton Leanhardt | 2016-01-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | replace yum with dnf | Seth Jennings | 2016-01-26 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #1279 from abutcher/is-atomic-swap | Brenton Leanhardt | 2016-01-26 | 6 | -9/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Install cockpit, logrotate and fluentd unless host is atomic. | Andrew Butcher | 2016-01-26 | 6 | -9/+8 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1275 from spinolacastro/datadir | Brenton Leanhardt | 2016-01-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Expose data_dir | Diego Castro | 2016-01-26 | 1 | -0/+1 |
* | | | | | | | | Merge pull request #1270 from detiber/openssl | Brenton Leanhardt | 2016-01-26 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Ensure openssl present for etcd_ca | Jason DeTiberus | 2016-01-25 | 1 | -0/+4 |
* | | | | | | | | | Merge pull request #1276 from spinolacastro/pkgversion | Brenton Leanhardt | 2016-01-26 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ |