summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2934 from sdodson/etcd3-v2Scott Dodson2016-12-071-7/+4
|\
| * etcd_upgrade: Simplify package installationScott Dodson2016-12-071-7/+4
* | Merge pull request #2939 from tbielawa/gh2933Jason DeTiberus2016-12-071-6/+15
|\ \
| * | Speed up 'make ci' and trim the outputTim Bielawa2016-12-071-6/+15
| |/
* | Merge pull request #2892 from detiber/upgradeSchedulerScott Dodson2016-12-079-269/+573
|\ \ | |/ |/|
| * add comments and remove debug codeJason DeTiberus2016-12-071-2/+8
| * Handle updating of scheduler config during upgradeJason DeTiberus2016-12-067-257/+549
| * Fix templatingJason DeTiberus2016-12-061-9/+9
| * test updatesJason DeTiberus2016-12-062-4/+10
* | Merge pull request #2928 from sdodson/etcd3-v2Scott Dodson2016-12-064-19/+21
|\ \ | |/ |/|
| * Always install latest etcd for containerized hostsScott Dodson2016-12-061-3/+5
| * etcd_upgrade : Use different variables for rpm vs container versionsScott Dodson2016-12-061-10/+10
| * Switch back to using etcd rather than etcd3Scott Dodson2016-12-062-6/+6
|/
* Merge pull request #2920 from detiber/schedulerVarFixAndrew Butcher2016-12-053-20/+18
|\
| * Update scheduler predicate/priorities varsJason DeTiberus2016-12-012-20/+16
| * fix tagsJason DeTiberus2016-12-011-0/+2
* | Merge pull request #2915 from sdodson/BZ1401425Scott Dodson2016-12-051-0/+4
|\ \
| * | node_dnsmasq - restart dnsmasq if it's not currently runningScott Dodson2016-12-051-0/+4
* | | Merge pull request #2914 from abutcher/upgrade-admission-checkScott Dodson2016-12-054-2/+6
|\ \ \ | |/ / |/| |
| * | Conditionalize master config update for admission_plugin_config.Andrew Butcher2016-12-054-2/+6
|/ /
* | Merge pull request #2908 from tremble/upgrade_factsScott Dodson2016-12-051-0/+1
|\ \
| * | upgrade_control_plane.yml: systemd_units.yaml nees the master factsMark Chappell2016-12-021-0/+1
* | | Merge pull request #2907 from tremble/masterAndrew Butcher2016-12-022-2/+2
|\ \ \ | |/ / |/| |
| * | openshift-master/restart : use openshift.common.hostname instead of inventory...Mark Chappell2016-12-022-2/+2
|/ /
* | Merge pull request #2888 from sdodson/dnsmasq-no-strict-orderScott Dodson2016-12-014-4/+4
|\ \
| * | openshift_node_dnsmasq - Remove strict-order option from dnsmasqScott Dodson2016-12-014-4/+4
* | | Merge pull request #2898 from smunilla/GH2738_misconfigured_etcd_varScott Dodson2016-12-011-0/+2
|\ \ \ | |_|/ |/| |
| * | Explictly set etcd vars for byo scaleupSamuel Munilla2016-11-301-0/+2
|/ /
* | Merge pull request #2859 from dgoodwin/ovs-docker-restartScott Dodson2016-11-308-41/+73
|\ \
| * | Cleanup ovs file and restart docker on every upgrade.Devan Goodwin2016-11-308-41/+73
| |/
* | Merge pull request #2887 from sdodson/image-stream-syncScott Dodson2016-11-3021-190/+434
|\ \ | |/ |/|
| * Sync latest image stream and templates for v1.3 and v1.4Scott Dodson2016-11-3021-190/+434
|/
* Merge pull request #2882 from sjenning/allow-latest-image-tagScott Dodson2016-11-291-1/+1
|\
| * allow 'latest' origin_image_tagSeth Jennings2016-11-291-1/+1
* | Merge pull request #2884 from sdodson/image-stream-syncScott Dodson2016-11-2910-25/+3689
|\ \
| * | xpaas v1.3.5Scott Dodson2016-11-2910-25/+3689
* | | Merge pull request #2855 from detiber/updateSchedulerDefaultsScott Dodson2016-11-2942-265/+859
|\ \ \
| * | | refactor handling of scheduler defaultsJason DeTiberus2016-11-298-39/+579
| * | | update tests and flake8/pylint fixesJason DeTiberus2016-11-2932-225/+266
| * | | fix taggingJason DeTiberus2016-11-291-0/+2
| * | | do not report changed for group mappingJason DeTiberus2016-11-292-1/+12
* | | | Merge pull request #2883 from tbielawa/update-ansible-ver-checkJason DeTiberus2016-11-291-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Ansible version check updateTim Bielawa2016-11-291-3/+3
|/ / /
* | | Merge pull request #2880 from mtnbikenc/docker-dupJason DeTiberus2016-11-291-1/+0
|\ \ \ | |_|/ |/| |
| * | Remove duplicate when keyRussell Teague2016-11-291-1/+0
| |/
* | Merge pull request #2831 from dgoodwin/upgrade-orderingScott Dodson2016-11-292-4/+4
|\ \
| * | Fix rare failure to deploy new registry/router after upgrade.Devan Goodwin2016-11-212-4/+4
* | | Merge pull request #2853 from alexcern/dhcpv6Scott Dodson2016-11-291-1/+1
|\ \ \
| * | | Set nameservers on DHCPv6 eventAlex Lossent2016-11-231-1/+1
* | | | Merge pull request #2876 from dustymabe/dusty-fix-etcd-selinuxScott Dodson2016-11-291-1/+1
|\ \ \ \ | |_|_|/ |/| | |