summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1722 from abutcher/containerized-cloudproviderBrenton Leanhardt2016-04-074-4/+4
|\
| * Add cloudprovider config dir to docker options.Andrew Butcher2016-04-064-4/+4
* | Merge pull request #1699 from abutcher/check-cloudprovider-kindBrenton Leanhardt2016-04-065-22/+25
|\ \
| * | Check for kind in cloudprovider facts prior to accessing.Andrew Butcher2016-04-045-22/+25
* | | Automatic commit of package [openshift-ansible] release [3.0.74-1].Brenton Leanhardt2016-04-062-2/+6
* | | Merge pull request #1660 from dgoodwin/admission-configBrenton Leanhardt2016-04-063-4/+56
|\ \ \
| * | | Add support for configuring oauth templates.Devan Goodwin2016-04-013-3/+28
| * | | Add support for templating master admissionConfig.Devan Goodwin2016-04-013-1/+28
* | | | Automatic commit of package [openshift-ansible] release [3.0.73-1].Troy Dawson2016-04-062-2/+19
* | | | Merge pull request #1723 from dgoodwin/osbs-dockerfileBrenton Leanhardt2016-04-061-10/+16
|\ \ \ \
| * | | | Replace unused Dockerfile with one used for official builds.Devan Goodwin2016-04-061-10/+16
|/ / / /
* | | | Merge pull request #1721 from kwoodson/userrefreshKenny Woodson2016-04-061-0/+2
|\ \ \ \
| * | | | Update for zbx_user refreshKenny Woodson2016-04-061-0/+2
* | | | | Merge pull request #1717 from sdodson/origin-docker-funtimesBrenton Leanhardt2016-04-061-1/+1
|\ \ \ \ \
| * | | | | Docker 1.9 is actually cool starting in origin 1.1.4Scott Dodson2016-04-061-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1716 from brenton/unmask1Brenton Leanhardt2016-04-061-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Unmask servicesBrenton Leanhardt2016-04-061-0/+8
|/ / / /
* | | | Merge pull request #1695 from brenton/bz1323123Brenton Leanhardt2016-04-0610-7/+8
|\ \ \ \
| * | | | Bug 1322788 - The IMAGE_VERSION wasn't added to atomic-openshift-master-api a...Brenton Leanhardt2016-04-0110-7/+8
| * | | | Bug 1323123 - upgrade failed to containerized OSE on RHEL Host without ose3.2...Brenton Leanhardt2016-04-011-1/+1
* | | | | Merge pull request #1698 from sdodson/xpaas13Brenton Leanhardt2016-04-06100-4502/+9996
|\ \ \ \ \
| * | | | | XPAAS v1.3 for OSE 3.2Scott Dodson2016-04-0453-5218/+1805
| * | | | | XPAAS 1.3 content for OSE 3.1Scott Dodson2016-04-0448-37/+8944
| |/ / / /
* | | | | Merge pull request #1654 from dgoodwin/gen-inventoryBrenton Leanhardt2016-04-055-49/+134
|\ \ \ \ \
| * | | | | Write inventory to same directory as quick install config.Devan Goodwin2016-03-243-11/+11
| * | | | | Add --gen-inventory command to atomic-openshift-installer.Devan Goodwin2016-03-244-39/+124
* | | | | | Automatic commit of package [openshift-ansible] release [3.0.72-1].Troy Dawson2016-04-052-2/+9
* | | | | | Merge pull request #1708 from mwoodson/docker-bugMatt Woodson2016-04-051-1/+1
|\ \ \ \ \ \
| * | | | | | when docker is installed, make it 1.8.2 to avoid issuesMatt Woodson2016-04-051-1/+1
|/ / / / / /
* | | | | | Merge pull request #1700 from brenton/32haBrenton Leanhardt2016-04-052-0/+11
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Pacemaker is unsupported for 3.2Brenton Leanhardt2016-04-042-0/+11
* | | | | | Merge pull request #1577 from brenton/docker19Brenton Leanhardt2016-04-051-2/+1
|\ \ \ \ \ \
| * | | | | | We require docker 1.9 for the 3.2 upgradeBrenton Leanhardt2016-03-091-2/+1
* | | | | | | Merge pull request #1655 from sdodson/more-docker19Brenton Leanhardt2016-04-059-25/+43
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Downgrade to docker 1.8.2 if installing OSE < 3.2Scott Dodson2016-04-059-25/+43
|/ / / / / /
* | | | | | Merge pull request #1704 from kwoodson/yeditfixMatt Woodson2016-04-048-37/+109
|\ \ \ \ \ \
| * | | | | | Fixing regexp. Periods are no longer allowedKenny Woodson2016-04-048-37/+109
* | | | | | | Automatic commit of package [openshift-ansible] release [3.0.71-1].Troy Dawson2016-04-042-2/+7
|/ / / / / /
* | | | | | Merge pull request #1702 from joelddiaz/heartbeat-severityJoel Diaz2016-04-041-0/+5
|\ \ \ \ \ \
| * | | | | | add higher severity trigger if no heartbeat for 1 hourJoel Diaz2016-04-041-0/+5
* | | | | | | Merge pull request #1701 from kwoodson/oceditfixKenny Woodson2016-04-042-4/+6
|\ \ \ \ \ \ \
| * | | | | | | Fixed oc_edit by requiring name and contentKenny Woodson2016-04-042-4/+6
|/ / / / / / /
* | | | | | | Merge pull request #1693 from kwoodson/yedit_enhancementsKenny Woodson2016-04-0417-259/+1371
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Yedit enhancementsKenny Woodson2016-04-0417-259/+1371
* | | | | | | Automatic commit of package [openshift-ansible] release [3.0.70-1].Brenton Leanhardt2016-04-012-2/+11
* | | | | | | Merge pull request #1544 from smunilla/BZ1299032Brenton Leanhardt2016-04-011-2/+2
|\ \ \ \ \ \ \
| * | | | | | | a-o-i: Error out early if callback_facts is NoneSamuel Munilla2016-03-041-2/+2
* | | | | | | | Merge pull request #1536 from smunilla/unattended_upgradesBrenton Leanhardt2016-04-013-29/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | a-o-i: Add 3.2 to list of supported versionsSamuel Munilla2016-03-234-26/+32
| * | | | | | | | a-o-i: Support for unattended upgradesSamuel Munilla2016-03-231-6/+17