summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2739 from harobed/issue_2717Scott Dodson2016-11-076-249/+0
|\
| * Remove unused playbooks adhoc metrics_setup files #2717Stéphane Klein2016-11-076-249/+0
* | Merge pull request #2741 from harobed/issue_2740Scott Dodson2016-11-071-2/+0
|\ \
| * | Remove unused openshift-ansible/inventory/hosts file #2740Stéphane Klein2016-11-071-2/+0
| |/
* | Merge pull request #2743 from harobed/issue_2742Scott Dodson2016-11-071-0/+9
|\ \
| * | Append /inventory/README.md to explain what is BYO inventory folder #2742Stéphane Klein2016-11-071-0/+9
| |/
* | Merge pull request #2728 from sjenning/fix-gce-multizoneScott Dodson2016-11-074-0/+23
|\ \ | |/ |/|
| * default to multizone GCE configSeth Jennings2016-11-044-0/+23
* | Automatic commit of package [openshift-ansible] release [3.4.17-1].Scott Dodson2016-11-042-2/+14
|/
* Merge pull request #2721 from sdodson/image-stream-syncScott Dodson2016-11-0423-202/+433
|\
| * Update hosted_templatesScott Dodson2016-11-043-0/+47
| * remove console exclusionsScott Dodson2016-11-041-1/+0
| * Update v1.4 contentScott Dodson2016-11-0320-201/+386
* | Merge pull request #2722 from smunilla/BZ1391515Scott Dodson2016-11-041-5/+5
|\ \
| * | Fix indentation for flannel etcd varsSamuel Munilla2016-11-041-5/+5
* | | Merge pull request #2718 from dgoodwin/restart-api-alwaysScott Dodson2016-11-041-0/+1
|\ \ \
| * | | Restart API service always as well.Devan Goodwin2016-11-041-0/+1
* | | | Merge pull request #2710 from smunilla/BZ1391515Scott Dodson2016-11-031-11/+8
|\ \ \ \ | | |/ / | |/| |
| * | | Update flannel etcd vars for 0.5.5Samuel Munilla2016-11-032-11/+10
* | | | Merge pull request #2713 from smunilla/BZ1384291Scott Dodson2016-11-031-0/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Update quick installer upgrade mappings for 3.4Samuel Munilla2016-11-031-0/+12
|/ / /
* | | Merge pull request #2683 from smunilla/BZ1388754Scott Dodson2016-11-031-6/+22
|\ \ \
| * | | Update master_lb vs cluster_hostname workflowSamuel Munilla2016-10-281-6/+22
* | | | Merge pull request #2707 from sdodson/tlsv12Scott Dodson2016-11-024-4/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Where we use curl force it to use tlsv1.2Scott Dodson2016-11-024-4/+4
|/ / /
* | | Merge pull request #2703 from abutcher/etcd-ca-default-daysScott Dodson2016-11-021-1/+1
|\ \ \
| * | | Bump etcd_ca_default_days to 5 years.Andrew Butcher2016-11-021-1/+1
* | | | Automatic commit of package [openshift-ansible] release [3.4.16-1].Scott Dodson2016-11-022-2/+14
* | | | Merge pull request #2697 from tbielawa/BZ1390064Tim Bielawa2016-11-021-1/+24
|\ \ \ \
| * | | | Fix HA environments incorrectly detecting mixed installed environmentsTim Bielawa2016-11-021-1/+24
| |/ / /
* | | | Merge pull request #2700 from dgoodwin/oom-serviceScott Dodson2016-11-022-2/+20
|\ \ \ \ | |/ / / |/| | |
| * | | Deploy an OOM systemd override for openvswitch.Devan Goodwin2016-11-022-2/+20
| | |/ | |/|
* | | Merge pull request #2695 from smunilla/BZ1383961Scott Dodson2016-11-022-10/+6
|\ \ \ | |/ / |/| |
| * | Update installation summary for etcd membersSamuel Munilla2016-11-012-10/+6
* | | Merge pull request #2690 from tbielawa/BZ1374170Tim Bielawa2016-11-011-6/+41
|\ \ \ | |/ / |/| |
| * | Only restart dnsmasq if the DNS servers have changedTim Bielawa2016-11-011-6/+41
|/ /
* | Merge pull request #2678 from smunilla/BZ1388762Scott Dodson2016-11-011-3/+4
|\ \
| * | Update variant_versionSamuel Munilla2016-10-271-3/+4
* | | Merge pull request #2694 from sdodson/masterScott Dodson2016-11-012-2/+2
|\ \ \
| * | | Fix changed_whenScott Dodson2016-11-012-2/+2
|/ / /
* | | Merge pull request #2689 from tdawson/2016-10-dockerfile-labelsScott Dodson2016-10-311-0/+3
|\ \ \
| * | | add io labelsTroy Dawson2016-10-311-0/+3
|/ / /
* | | Merge pull request #2686 from sdodson/BZ1390169Scott Dodson2016-10-312-1/+21
|\ \ \
| * | | Touch all ini_file files before using themScott Dodson2016-10-312-1/+21
* | | | Merge pull request #2680 from tbielawa/BZ389137Scott Dodson2016-10-311-2/+22
|\ \ \ \ | |/ / / |/| | |
| * | | Remove commit offset strings from parsed versionsTim Bielawa2016-10-311-2/+22
|/ / /
* | | Automatic commit of package [openshift-ansible] release [3.4.15-1].Troy Dawson2016-10-312-2/+7
* | | Merge pull request #2682 from dgoodwin/bump-documented-releaseScott Dodson2016-10-282-2/+2
|\ \ \
| * | | Bump documented openshift_release for 1.4/3.4.Devan Goodwin2016-10-282-2/+2
* | | | Merge pull request #2679 from erinn/masterScott Dodson2016-10-281-1/+6
|\ \ \ \ | |_|_|/ |/| | |