Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #1720 from abutcher/fix-docker-install | Brenton Leanhardt | 2016-04-07 | 1 | -2/+2 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Test docker_version_result.stdout when determining if docker should be instal... | Andrew Butcher | 2016-04-06 | 1 | -2/+2 | |
* | | | Merge pull request #1719 from kwoodson/oadmrouter | Kenny Woodson | 2016-04-07 | 11 | -82/+1375 | |
|\ \ \ | ||||||
| * | | | First attempt at oadm router module | Kenny Woodson | 2016-04-07 | 11 | -82/+1375 | |
* | | | | Merge pull request #1724 from abutcher/nfs-no-common | Brenton Leanhardt | 2016-04-07 | 2 | -8/+7 | |
|\ \ \ \ | ||||||
| * | | | | Remove openshift_common dep from openshift_storage_nfs | Andrew Butcher | 2016-04-06 | 2 | -8/+7 | |
* | | | | | Merge pull request #1722 from abutcher/containerized-cloudprovider | Brenton Leanhardt | 2016-04-07 | 4 | -4/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add cloudprovider config dir to docker options. | Andrew Butcher | 2016-04-06 | 4 | -4/+4 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #1699 from abutcher/check-cloudprovider-kind | Brenton Leanhardt | 2016-04-06 | 5 | -22/+25 | |
|\ \ \ \ \ | ||||||
| * | | | | | Check for kind in cloudprovider facts prior to accessing. | Andrew Butcher | 2016-04-04 | 5 | -22/+25 | |
* | | | | | | Merge pull request #1660 from dgoodwin/admission-config | Brenton Leanhardt | 2016-04-06 | 3 | -4/+56 | |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | ||||||
| * | | | | | Add support for configuring oauth templates. | Devan Goodwin | 2016-04-01 | 3 | -3/+28 | |
| * | | | | | Add support for templating master admissionConfig. | Devan Goodwin | 2016-04-01 | 3 | -1/+28 | |
| |/ / / / | ||||||
* | | | | | 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 | |
* | | | | | | Docker 1.9 is actually cool starting in origin 1.1.4 | Scott Dodson | 2016-04-06 | 1 | -1/+1 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge pull request #1695 from brenton/bz1323123 | Brenton Leanhardt | 2016-04-06 | 7 | -3/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | Bug 1322788 - The IMAGE_VERSION wasn't added to atomic-openshift-master-api a... | Brenton Leanhardt | 2016-04-01 | 7 | -3/+4 | |
| * | | | | | 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 | |
| |/ / / | ||||||
* | | | | 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 | 1 | -0/+4 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Pacemaker is unsupported for 3.2 | Brenton Leanhardt | 2016-04-04 | 1 | -0/+4 | |
| | |/ | |/| | ||||||
* / | | Downgrade to docker 1.8.2 if installing OSE < 3.2 | Scott Dodson | 2016-04-05 | 9 | -25/+43 | |
|/ / | ||||||
* | | Fixing regexp. Periods are no longer allowed | Kenny Woodson | 2016-04-04 | 8 | -37/+109 | |
* | | 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 | |
* | | | 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 | 15 | -249/+1311 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Yedit enhancements | Kenny Woodson | 2016-04-04 | 15 | -249/+1311 | |
* | | | Allow for overriding scheduler config | Jason DeTiberus | 2016-03-31 | 5 | -18/+26 | |
* | | | Bug 1320829 - Ensure docker installed for facts | Jason DeTiberus | 2016-03-31 | 12 | -82/+170 | |
* | | | Merge pull request #1634 from abutcher/aws-cloud-provider | Brenton Leanhardt | 2016-03-31 | 16 | -71/+223 | |
|\ \ \ | ||||||
| * | | | Add AWS cloud provider support. | Andrew Butcher | 2016-03-29 | 16 | -71/+223 | |
* | | | | Merge pull request #1684 from brenton/bz1322335 | Brenton Leanhardt | 2016-03-31 | 1 | -1/+5 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Bug 1322335 - The package name is wrong for rpm upgrade | Brenton Leanhardt | 2016-03-30 | 1 | -1/+5 | |
| |/ / | ||||||
* | | | Fixed generate header. | Kenny Woodson | 2016-03-31 | 5 | -5/+5 | |
* | | | Merge pull request #1679 from kwoodson/apirefactor | Kenny Woodson | 2016-03-30 | 26 | -254/+1956 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Moving generation of ansible module side by side with module. | Kenny Woodson | 2016-03-30 | 26 | -254/+1956 | |
* | | | The systemd unit for atomic-openshift-master wasn't not being created | Brenton Leanhardt | 2016-03-29 | 1 | -6/+16 | |
* | | | Use openshift.master.ha instead of duplicating the logic | Brenton Leanhardt | 2016-03-29 | 2 | -7/+7 | |
* | | | Workaround for authenticated registries | Brenton Leanhardt | 2016-03-29 | 1 | -0/+21 | |
* | | | First pass at systemd unit refactor | Brenton Leanhardt | 2016-03-29 | 6 | -96/+104 | |
* | | | Merge pull request #1671 from sjenning/systemd-unit-fixes | Brenton Leanhardt | 2016-03-29 | 6 | -6/+6 | |
|\ \ \ | ||||||
| * | | | make docker service want ose containerized services | Seth Jennings | 2016-03-28 | 6 | -6/+6 | |
* | | | | fix the key name for the dynamic item of avalable | zhizhang | 2016-03-29 | 1 | -2/+2 | |
* | | | | Merge pull request #1665 from sdodson/bz1320335 | Brenton Leanhardt | 2016-03-28 | 36 | -218/+422 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Sync latest db-templates and qucikstart-templates | Scott Dodson | 2016-03-24 | 36 | -218/+422 |