Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace unused Dockerfile with one used for official builds. | Devan Goodwin | 2016-04-06 | 1 | -10/+16 |
* | Merge pull request #1721 from kwoodson/userrefresh | Kenny Woodson | 2016-04-06 | 1 | -0/+2 |
|\ | |||||
| * | Update for zbx_user refresh | Kenny Woodson | 2016-04-06 | 1 | -0/+2 |
* | | Merge pull request #1717 from sdodson/origin-docker-funtimes | Brenton Leanhardt | 2016-04-06 | 1 | -1/+1 |
|\ \ | |||||
| * | | Docker 1.9 is actually cool starting in origin 1.1.4 | Scott Dodson | 2016-04-06 | 1 | -1/+1 |
* | | | Merge pull request #1716 from brenton/unmask1 | Brenton Leanhardt | 2016-04-06 | 1 | -0/+8 |
|\ \ \ | |/ / |/| | | |||||
| * | | Unmask services | Brenton Leanhardt | 2016-04-06 | 1 | -0/+8 |
|/ / | |||||
* | | Merge pull request #1695 from brenton/bz1323123 | Brenton Leanhardt | 2016-04-06 | 10 | -7/+8 |
|\ \ | |||||
| * | | Bug 1322788 - The IMAGE_VERSION wasn't added to atomic-openshift-master-api a... | Brenton Leanhardt | 2016-04-01 | 10 | -7/+8 |
| * | | Bug 1323123 - upgrade failed to containerized OSE on RHEL Host without ose3.2... | Brenton Leanhardt | 2016-04-01 | 1 | -1/+1 |
* | | | Merge pull request #1698 from sdodson/xpaas13 | Brenton Leanhardt | 2016-04-06 | 100 | -4502/+9996 |
|\ \ \ | |||||
| * | | | XPAAS v1.3 for OSE 3.2 | Scott Dodson | 2016-04-04 | 53 | -5218/+1805 |
| * | | | XPAAS 1.3 content for OSE 3.1 | Scott Dodson | 2016-04-04 | 48 | -37/+8944 |
| |/ / | |||||
* | | | Merge pull request #1654 from dgoodwin/gen-inventory | Brenton Leanhardt | 2016-04-05 | 5 | -49/+134 |
|\ \ \ | |||||
| * | | | Write inventory to same directory as quick install config. | Devan Goodwin | 2016-03-24 | 3 | -11/+11 |
| * | | | Add --gen-inventory command to atomic-openshift-installer. | Devan Goodwin | 2016-03-24 | 4 | -39/+124 |
* | | | | Automatic commit of package [openshift-ansible] release [3.0.72-1]. | Troy Dawson | 2016-04-05 | 2 | -2/+9 |
* | | | | Merge pull request #1708 from mwoodson/docker-bug | Matt Woodson | 2016-04-05 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | when docker is installed, make it 1.8.2 to avoid issues | Matt Woodson | 2016-04-05 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1700 from brenton/32ha | Brenton Leanhardt | 2016-04-05 | 2 | -0/+11 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Pacemaker is unsupported for 3.2 | Brenton Leanhardt | 2016-04-04 | 2 | -0/+11 |
* | | | | Merge pull request #1577 from brenton/docker19 | Brenton Leanhardt | 2016-04-05 | 1 | -2/+1 |
|\ \ \ \ | |||||
| * | | | | We require docker 1.9 for the 3.2 upgrade | Brenton Leanhardt | 2016-03-09 | 1 | -2/+1 |
* | | | | | Merge pull request #1655 from sdodson/more-docker19 | Brenton Leanhardt | 2016-04-05 | 9 | -25/+43 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Downgrade to docker 1.8.2 if installing OSE < 3.2 | Scott Dodson | 2016-04-05 | 9 | -25/+43 |
|/ / / / | |||||
* | | | | Merge pull request #1704 from kwoodson/yeditfix | Matt Woodson | 2016-04-04 | 8 | -37/+109 |
|\ \ \ \ | |||||
| * | | | | Fixing regexp. Periods are no longer allowed | Kenny Woodson | 2016-04-04 | 8 | -37/+109 |
* | | | | | Automatic commit of package [openshift-ansible] release [3.0.71-1]. | Troy Dawson | 2016-04-04 | 2 | -2/+7 |
|/ / / / | |||||
* | | | | Merge pull request #1702 from joelddiaz/heartbeat-severity | Joel Diaz | 2016-04-04 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | add higher severity trigger if no heartbeat for 1 hour | Joel Diaz | 2016-04-04 | 1 | -0/+5 |
* | | | | | Merge pull request #1701 from kwoodson/oceditfix | Kenny Woodson | 2016-04-04 | 2 | -4/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed oc_edit by requiring name and content | Kenny Woodson | 2016-04-04 | 2 | -4/+6 |
|/ / / / / | |||||
* | | | | | Merge pull request #1693 from kwoodson/yedit_enhancements | Kenny Woodson | 2016-04-04 | 17 | -259/+1371 |
|\ \ \ \ \ | |||||
| * | | | | | Yedit enhancements | Kenny Woodson | 2016-04-04 | 17 | -259/+1371 |
* | | | | | | Automatic commit of package [openshift-ansible] release [3.0.70-1]. | Brenton Leanhardt | 2016-04-01 | 2 | -2/+11 |
* | | | | | | Merge pull request #1544 from smunilla/BZ1299032 | Brenton Leanhardt | 2016-04-01 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | a-o-i: Error out early if callback_facts is None | Samuel Munilla | 2016-03-04 | 1 | -2/+2 |
* | | | | | | | Merge pull request #1536 from smunilla/unattended_upgrades | Brenton Leanhardt | 2016-04-01 | 3 | -29/+47 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | a-o-i: Add 3.2 to list of supported versions | Samuel Munilla | 2016-03-23 | 4 | -26/+32 |
| * | | | | | | | a-o-i: Support for unattended upgrades | Samuel Munilla | 2016-03-23 | 1 | -6/+17 |
| * | | | | | | | a-o-i: More flexible upgrade mappings | Samuel Munilla | 2016-03-23 | 1 | -2/+4 |
* | | | | | | | | Merge pull request #1653 from smunilla/BZ1320017 | Brenton Leanhardt | 2016-04-01 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | a-o-i: OSE/AEP 3.2 product option | Samuel Munilla | 2016-03-23 | 1 | -1/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #1650 from lhuard1A/ssh_pipelining | Brenton Leanhardt | 2016-04-01 | 3 | -0/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Enable Ansible ssh pipelining to speedup deployment | Lénaïc Huard | 2016-04-01 | 3 | -0/+25 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #1680 from detiber/scheduler_config | Brenton Leanhardt | 2016-04-01 | 5 | -18/+26 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Allow for overriding scheduler config | Jason DeTiberus | 2016-03-31 | 5 | -18/+26 |
|/ / / / / / / | |||||
* | | | | | | | Automatic commit of package [openshift-ansible] release [3.0.69-1]. | Brenton Leanhardt | 2016-03-31 | 2 | -2/+10 |
* | | | | | | | Merge pull request #1674 from detiber/bz1320829 | Brenton Leanhardt | 2016-03-31 | 13 | -83/+171 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bug 1320829 - Ensure docker installed for facts | Jason DeTiberus | 2016-03-31 | 13 | -83/+171 |
|/ / / / / / / |