summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1094 from abutcher/notifyBrenton Leanhardt2015-12-243-2/+9
|\
| * Conditionalize for 3.1.1/1.1.1Andrew Butcher2015-12-182-0/+9
| * Use notify for workaround controllers unit.Andrew Butcher2015-12-182-3/+1
* | Merge pull request #1100 from sdodson/xpaas-1.2-jboss-fuseBrenton Leanhardt2015-12-231-1/+1
|\ \
| * | Install all xpaas streams when enabledScott Dodson2015-12-221-1/+1
* | | Merge pull request #1098 from lloy0076/patch-1Brenton Leanhardt2015-12-231-1/+1
|\ \ \ | |/ / |/| |
| * | Link to Tito Home Page is BrokenDavid Lloyd2015-12-221-1/+1
|/ /
* | Merge pull request #808 from sdodson/containersBrenton Leanhardt2015-12-1968-122/+827
|\ \ | |/ |/|
| * Add some guards to wait for images to be pulled before moving onScott Dodson2015-12-164-6/+63
| * Install httpd-tools when not is_atomicScott Dodson2015-12-161-1/+1
| * Fix containerized variableScott Dodson2015-12-151-1/+1
| * Skip yum/dnf ops when is_containerizedScott Dodson2015-12-1520-15/+36
| * Move all docker config into openshift_docker to minimize docker restartsScott Dodson2015-12-153-8/+31
| * Add openshift_cli roleScott Dodson2015-12-156-18/+68
| * pull docker images only if not already presentJason DeTiberus2015-12-154-10/+41
| * fixesJason DeTiberus2015-12-1512-84/+104
| * Containerization work by @sdodsonScott Dodson2015-12-1549-174/+527
| * Initial containerization work from @ibottyTobias Florek2015-12-1531-23/+173
* | Merge pull request #1086 from sdodson/xpaas-1.2-jboss-fuseThomas Wiest2015-12-1742-458/+6825
|\ \
| * | Add jboss-fuse/application-templates/fis-image-streams.jsonScott Dodson2015-12-172-0/+57
| * | Update from jboss-openshift/application-templates ose-v1.2.0-1Scott Dodson2015-12-1741-458/+6768
* | | Merge pull request #1065 from lebauce/flannel-fixesBrenton Leanhardt2015-12-171-0/+1
|\ \ \
| * | | Properly set use_flannel factSylvain Baubeau2015-12-161-0/+1
* | | | Merge pull request #1085 from smunilla/fix_test_fresh_install_with_configBrenton Leanhardt2015-12-171-1/+1
|\ \ \ \
| * | | | atomic-openshift-installer: Fix broken nosetestSamuel Munilla2015-12-171-1/+1
* | | | | Merge pull request #1091 from joelddiaz/dns-averageJoel Diaz2015-12-171-2/+2
|\ \ \ \ \
| * | | | | change dns triggers to averageJoel Diaz2015-12-171-2/+2
|/ / / / /
* | | | | Merge pull request #1089 from joelddiaz/docker-dns-existingJoel Diaz2015-12-171-0/+10
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | add item/trigger for dns tests on all currently running containersJoel Diaz2015-12-171-0/+10
|/ / / /
* | | | Merge pull request #1084 from joelddiaz/docker-dns-triggerJoel Diaz2015-12-171-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | fix logic to tolerate occasional failuresJoel Diaz2015-12-171-1/+1
* | | | Merge pull request #1062 from smunilla/3.0_ha_hintBrenton Leanhardt2015-12-162-10/+29
|\ \ \ \
| * | | | quick installer testsSamuel Munilla2015-12-161-0/+19
| * | | | atomic-openshift-installer: Remove HA hint for 3.0 installSamuel Munilla2015-12-161-10/+10
* | | | | Merge pull request #1076 from sdodson/versionsThomas Wiest2015-12-161-3/+2
|\ \ \ \ \
| * | | | | Clean up versions.shScott Dodson2015-12-161-3/+2
| |/ / / /
* | | | | Merge pull request #1074 from joelddiaz/zagg-client-ovsJoel Diaz2015-12-161-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | change ovs mount to /var/run/openvswitchJoel Diaz2015-12-161-1/+1
|/ / / /
* | | | Merge pull request #1073 from twiest/prThomas Wiest2015-12-161-3/+13
|\ \ \ \ | |/ / / |/| | |
| * | | split zagg.server.processor.errors into separate heartbeat and metrics error ...Thomas Wiest2015-12-161-3/+13
|/ / /
* | | Merge pull request #1069 from joelddiaz/docker-dnsJoel Diaz2015-12-151-0/+10
|\ \ \ | |_|/ |/| |
| * | Add zabbix values to track docker container DNS resultsJoel Diaz2015-12-151-0/+10
* | | Merge pull request #1067 from dgoodwin/node-registry-bugThomas Wiest2015-12-151-2/+2
|\ \ \
| * | | Fix registry modification for new deployment types.Devan Goodwin2015-12-151-2/+2
* | | | Merge pull request #1057 from EricMountain-1A/fix-node-network-fail-4githubThomas Wiest2015-12-152-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes typo when setting facts to record whether master/node has been restarte...Eric Mountain2015-12-142-4/+4
* | | | Merge pull request #1064 from kwoodson/ohifixKenny Woodson2015-12-143-49/+75
|\ \ \ \
| * | | | Updates to ohi to pull cache if specified. Also require versionKenny Woodson2015-12-143-49/+75
* | | | | Merge pull request #1063 from mwoodson/create_appMatt Woodson2015-12-141-0/+8
|\ \ \ \ \
| * | | | | Zabbix: added trigger to monitor app create over the last hourMatt Woodson2015-12-141-0/+8
|/ / / / /