summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2677 from EricMountain-1A/fix_docker_fatal_selinux_4upstr...Scott Dodson2016-11-141-11/+11
|\
| * Docker daemon is started prematurely.Eric Mountain2016-11-141-11/+11
* | Merge pull request #2802 from sdodson/image-stream-syncScott Dodson2016-11-144-3/+40
|\ \ | |/ |/|
| * Sync logging deployer changes from origin to enterpriseScott Dodson2016-11-141-0/+20
| * Sync latest enterprise/metrics-deployer.yamlScott Dodson2016-11-142-0/+12
| * Sync latest s2i contentScott Dodson2016-11-141-3/+8
|/
* Merge pull request #2562 from sdodson/etcd3Scott Dodson2016-11-1418-81/+366
|\
| * Actually upgrade host etcdctl no matter whatScott Dodson2016-11-141-2/+2
| * Make etcd containerized upgrade stepwiseScott Dodson2016-11-142-18/+51
| * Add updates for containerizedScott Dodson2016-11-146-14/+74
| * Add etcd upgrade for RHEL and FedoraScott Dodson2016-11-149-1/+164
| * Drop /etc/profile.d/etcdctl.shScott Dodson2016-11-144-0/+26
| * Move backups to a separate file for re-useScott Dodson2016-11-142-73/+74
| * Uninstall etcd3 packageScott Dodson2016-11-121-0/+2
* | Merge pull request #2794 from dgoodwin/no-fact-cacheScott Dodson2016-11-141-0/+1
|\ \
| * | Fix HA upgrade when fact cache deleted.Devan Goodwin2016-11-141-0/+1
| |/
* | Merge pull request #2798 from tbielawa/BZ1389137Tim Bielawa2016-11-142-0/+26
|\ \
| * | Fix commit-offsets in version detection for containerized installsTim Bielawa2016-11-142-0/+26
| |/
* | Merge pull request #2797 from abutcher/metrics-versionScott Dodson2016-11-141-1/+1
|\ \
| * | Fix openshift_hosted_metrics_deployer_version set_fact.Andrew Butcher2016-11-141-1/+1
|/ /
* | Merge pull request #2793 from mtnbikenc/docker-fixScott Dodson2016-11-145-6/+6
|\ \ | |/ |/|
| * Added dependency of os_firewall to docker roleRussell Teague2016-11-145-6/+6
|/
* Merge pull request #2770 from mtnbikenc/docker-fixRussell Teague2016-11-113-1/+19
|\
| * Resolve docker and iptables service dependenciesRussell Teague2016-11-113-1/+19
* | Merge pull request #2783 from tbielawa/aoioutputTim Bielawa2016-11-101-0/+8
|\ \
| * | Enable quiet output for all a-o-i commandsTim Bielawa2016-11-101-0/+8
* | | Merge pull request #2600 from mscherer/python3_portingScott Dodson2016-11-101-8/+17
|\ \ \
| * | | Port openshift_facts to py3Michael Scherer2016-10-141-8/+17
* | | | Merge pull request #2779 from smunilla/BZ1339626Scott Dodson2016-11-101-1/+3
|\ \ \ \
| * | | | Update override cluster_hostnameSamuel Munilla2016-11-101-1/+3
| | |/ / | |/| |
* | | | Merge pull request #2777 from dgoodwin/jenkins-role-bindingsScott Dodson2016-11-102-2/+14
|\ \ \ \
| * | | | Reconcile role bindings for jenkins pipeline during upgrade.Devan Goodwin2016-11-102-2/+14
| | |_|/ | |/| |
* | | | Merge pull request #2781 from rhcarvalho/travisScott Dodson2016-11-103-0/+18
|\ \ \ \
| * | | | Add Travis integrationRodolfo Carvalho2016-11-103-0/+18
| | |/ / | |/| |
* | | | Merge pull request #2784 from abutcher/upgrade-embedded-etcdScott Dodson2016-11-101-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Default groups.oo_etcd_to_config when setting embedded_etcd in control plane ...Andrew Butcher2016-11-101-1/+1
| |/ /
* | | Merge pull request #2766 from andrewklau/masterScott Dodson2016-11-092-19/+19
|\ \ \
| * | | Re-sync v1.4 image streamsAndrew Lau2016-11-092-19/+19
* | | | Merge pull request #2776 from sdodson/BZ1390160Scott Dodson2016-11-091-2/+2
|\ \ \ \
| * | | | Fix typos in openshift_facts gce cloud providerScott Dodson2016-11-091-2/+2
|/ / / /
* | | | Merge pull request #2773 from sdodson/BZ1393187Scott Dodson2016-11-091-1/+1
|\ \ \ \
| * | | | Don't upgrade etcd on backup operationsScott Dodson2016-11-091-1/+1
| |/ / /
* | | | Merge pull request #2772 from sdodson/masterScott Dodson2016-11-091-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Bump ansible requirement to 2.2.0.0-1 (GA)Scott Dodson2016-11-091-1/+1
| |/ /
* | | Merge pull request #2730 from dgoodwin/fix-ha-etcd-backupScott Dodson2016-11-091-1/+14
|\ \ \ | |/ / |/| |
| * | Fix etcd backup failure due to corrupted facts.Devan Goodwin2016-11-091-1/+14
* | | Merge pull request #2764 from openshift/revert-2751-BZ1388253Scott Dodson2016-11-089-201/+66
|\ \ \
| * | | Revert "Revert openshift.node.nodename changes"Scott Dodson2016-11-089-201/+66
|/ / /
* | | Merge pull request #2762 from rhcarvalho/readme-nitsScott Dodson2016-11-081-0/+2
|\ \ \
| * | | README: fix markdown formattingRodolfo Carvalho2016-11-081-0/+2
|/ / /