Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2783 from tbielawa/aoioutput | Tim Bielawa | 2016-11-10 | 1 | -0/+8 |
|\ | |||||
| * | Enable quiet output for all a-o-i commands | Tim Bielawa | 2016-11-10 | 1 | -0/+8 |
* | | Merge pull request #2600 from mscherer/python3_porting | Scott Dodson | 2016-11-10 | 1 | -8/+17 |
|\ \ | |||||
| * | | Port openshift_facts to py3 | Michael Scherer | 2016-10-14 | 1 | -8/+17 |
* | | | Merge pull request #2779 from smunilla/BZ1339626 | Scott Dodson | 2016-11-10 | 1 | -1/+3 |
|\ \ \ | |||||
| * | | | Update override cluster_hostname | Samuel Munilla | 2016-11-10 | 1 | -1/+3 |
| | |/ | |/| | |||||
* | | | Merge pull request #2777 from dgoodwin/jenkins-role-bindings | Scott Dodson | 2016-11-10 | 2 | -2/+14 |
|\ \ \ | |||||
| * | | | Reconcile role bindings for jenkins pipeline during upgrade. | Devan Goodwin | 2016-11-10 | 2 | -2/+14 |
* | | | | Merge pull request #2781 from rhcarvalho/travis | Scott Dodson | 2016-11-10 | 3 | -0/+18 |
|\ \ \ \ | |||||
| * | | | | Add Travis integration | Rodolfo Carvalho | 2016-11-10 | 3 | -0/+18 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #2784 from abutcher/upgrade-embedded-etcd | Scott Dodson | 2016-11-10 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Default groups.oo_etcd_to_config when setting embedded_etcd in control plane ... | Andrew Butcher | 2016-11-10 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #2766 from andrewklau/master | Scott Dodson | 2016-11-09 | 2 | -19/+19 |
|\ \ \ | |||||
| * | | | Re-sync v1.4 image streams | Andrew Lau | 2016-11-09 | 2 | -19/+19 |
* | | | | Merge pull request #2776 from sdodson/BZ1390160 | Scott Dodson | 2016-11-09 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix typos in openshift_facts gce cloud provider | Scott Dodson | 2016-11-09 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #2773 from sdodson/BZ1393187 | Scott Dodson | 2016-11-09 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Don't upgrade etcd on backup operations | Scott Dodson | 2016-11-09 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #2772 from sdodson/master | Scott Dodson | 2016-11-09 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Bump ansible requirement to 2.2.0.0-1 (GA) | Scott Dodson | 2016-11-09 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #2730 from dgoodwin/fix-ha-etcd-backup | Scott Dodson | 2016-11-09 | 1 | -1/+14 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix etcd backup failure due to corrupted facts. | Devan Goodwin | 2016-11-09 | 1 | -1/+14 |
* | | | Merge pull request #2764 from openshift/revert-2751-BZ1388253 | Scott Dodson | 2016-11-08 | 9 | -201/+66 |
|\ \ \ | |||||
| * | | | Revert "Revert openshift.node.nodename changes" | Scott Dodson | 2016-11-08 | 9 | -201/+66 |
|/ / / | |||||
* | | | Merge pull request #2762 from rhcarvalho/readme-nits | Scott Dodson | 2016-11-08 | 1 | -0/+2 |
|\ \ \ | |||||
| * | | | README: fix markdown formatting | Rodolfo Carvalho | 2016-11-08 | 1 | -0/+2 |
|/ / / | |||||
* | | | Merge pull request #2727 from rhcarvalho/contributing | Scott Dodson | 2016-11-08 | 4 | -280/+153 |
|\ \ \ | |||||
| * | | | Create contribution guide | Rodolfo Carvalho | 2016-11-08 | 2 | -15/+112 |
| * | | | Remove README_AEP.md | Rodolfo Carvalho | 2016-11-08 | 2 | -234/+0 |
| * | | | README: move structure overview to the top | Rodolfo Carvalho | 2016-11-08 | 1 | -8/+9 |
| * | | | README: cleanup setup steps | Rodolfo Carvalho | 2016-11-08 | 1 | -11/+14 |
| * | | | README: remove OSX setup requirements | Rodolfo Carvalho | 2016-11-08 | 1 | -6/+0 |
| * | | | README: improve first paragraph | Rodolfo Carvalho | 2016-11-08 | 1 | -5/+8 |
| * | | | README: add links, fix typos | Rodolfo Carvalho | 2016-11-08 | 1 | -10/+14 |
| * | | | README: improve markdown formatting | Rodolfo Carvalho | 2016-11-08 | 1 | -8/+11 |
| * | | | Make it easier to run Python tests | Rodolfo Carvalho | 2016-11-08 | 1 | -0/+2 |
| |/ / | |||||
* | | | Merge pull request #2753 from jkhelil/proxy_settings | Scott Dodson | 2016-11-08 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Always add local dns domain to no_proxy | jawed | 2016-11-08 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge pull request #2729 from tbielawa/BZ1390064 | Scott Dodson | 2016-11-08 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | Change the logic to just compare against masters and nodes. | Tim Bielawa | 2016-11-07 | 1 | -4/+4 |
* | | | | Merge pull request #2751 from sdodson/BZ1388253 | Scott Dodson | 2016-11-08 | 9 | -66/+201 |
|\ \ \ \ | |||||
| * | | | | Revert "Fix the nodeName of the OpenShift nodes on OpenStack" | Scott Dodson | 2016-11-07 | 4 | -26/+176 |
| * | | | | Revert "Fix OpenStack cloud provider" | Scott Dodson | 2016-11-07 | 6 | -31/+19 |
| * | | | | Revert "Check that OpenStack hostnames are resolvable" | Scott Dodson | 2016-11-07 | 1 | -9/+6 |
* | | | | | Merge pull request #2754 from jprovaznik/flannel_prefix | Scott Dodson | 2016-11-08 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | FIx flannel var name | Jan Provaznik | 2016-11-08 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #2757 from dgoodwin/oom-upgrade-symlink-master | Scott Dodson | 2016-11-08 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Add missing symlink for node openvswitch oom fix. | Devan Goodwin | 2016-11-08 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #2759 from sdodson/flannel-containerized | Scott Dodson | 2016-11-08 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Install flannel RPM on containerized but not atomic | Scott Dodson | 2016-11-08 | 1 | -1/+1 |
| |/ / / / |