summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / /
* | | Merge pull request #2727 from rhcarvalho/contributingScott Dodson2016-11-084-280/+153
|\ \ \
| * | | Create contribution guideRodolfo Carvalho2016-11-082-15/+112
| * | | Remove README_AEP.mdRodolfo Carvalho2016-11-082-234/+0
| * | | README: move structure overview to the topRodolfo Carvalho2016-11-081-8/+9
| * | | README: cleanup setup stepsRodolfo Carvalho2016-11-081-11/+14
| * | | README: remove OSX setup requirementsRodolfo Carvalho2016-11-081-6/+0
| * | | README: improve first paragraphRodolfo Carvalho2016-11-081-5/+8
| * | | README: add links, fix typosRodolfo Carvalho2016-11-081-10/+14
| * | | README: improve markdown formattingRodolfo Carvalho2016-11-081-8/+11
| * | | Make it easier to run Python testsRodolfo Carvalho2016-11-081-0/+2
| |/ /
* | | Merge pull request #2753 from jkhelil/proxy_settingsScott Dodson2016-11-081-2/+2
|\ \ \
| * | | Always add local dns domain to no_proxyjawed2016-11-081-2/+2
| |/ /
* | | Merge pull request #2729 from tbielawa/BZ1390064Scott Dodson2016-11-081-4/+4
|\ \ \
| * | | Change the logic to just compare against masters and nodes.Tim Bielawa2016-11-071-4/+4
* | | | Merge pull request #2751 from sdodson/BZ1388253Scott Dodson2016-11-089-66/+201
|\ \ \ \
| * | | | Revert "Fix the nodeName of the OpenShift nodes on OpenStack"Scott Dodson2016-11-074-26/+176
| * | | | Revert "Fix OpenStack cloud provider"Scott Dodson2016-11-076-31/+19
| * | | | Revert "Check that OpenStack hostnames are resolvable"Scott Dodson2016-11-071-9/+6
* | | | | Merge pull request #2754 from jprovaznik/flannel_prefixScott Dodson2016-11-081-1/+1
|\ \ \ \ \
| * | | | | FIx flannel var nameJan Provaznik2016-11-081-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #2757 from dgoodwin/oom-upgrade-symlink-masterScott Dodson2016-11-081-0/+1
|\ \ \ \ \
| * | | | | Add missing symlink for node openvswitch oom fix.Devan Goodwin2016-11-081-0/+1
| |/ / / /
* | | | | Merge pull request #2759 from sdodson/flannel-containerizedScott Dodson2016-11-081-1/+1
|\ \ \ \ \
| * | | | | Install flannel RPM on containerized but not atomicScott Dodson2016-11-081-1/+1
| |/ / / /
* | | | | Merge pull request #2752 from sdodson/cluster-cidr-refactorScott Dodson2016-11-081-4/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Refactor default sdn_cluster_network_cidr and sdn_host_subnet_lengthScott Dodson2016-11-071-4/+9
|/ / / /