summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / /
* | | Merge pull request #2652 from smunilla/BZ1320952_default_for_clusterNetworkCIDRScott Dodson2016-11-073-13/+27
|\ \ \ | |/ / |/| |
| * | Update defaults for clusterNetworkCIDR & hostSubnetLengthSamuel Munilla2016-11-033-13/+27
* | | Merge pull request #2749 from sallyom/give_AWS_creds_no_logAndrew Butcher2016-11-071-0/+1
|\ \ \
| * | | set AWS creds task with no_logsSally O'Malley2016-11-071-0/+1
* | | | Merge pull request #2735 from rhcarvalho/deadcodeScott Dodson2016-11-073-8/+0
|\ \ \ \ | |/ / / |/| | |
| * | | a-o-i: remove dummy data_fileRodolfo Carvalho2016-11-052-6/+0
| * | | a-o-i: remove script leftover from OpenShift v2Rodolfo Carvalho2016-11-051-2/+0
* | | | Merge pull request #2696 from tbielawa/more_unit_testsScott Dodson2016-11-071-1/+29
|\ \ \ \