summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Merge remote-tracking branch 'origin/upgradeFix2' into upgradeFix2Jason DeTiberus2015-11-064-4/+251
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Merge pull request #50 from dgoodwin/pre-upgradeJason DeTiberus2015-11-063-1/+195
| | |\| | | | | | |
| | | * | | | | | | Fix pylint errors with getting hosts to run on.Devan Goodwin2015-11-061-1/+3
| | | * | | | | | | Add pre-upgrade script to be run on first master.Devan Goodwin2015-11-062-0/+192
| | * | | | | | | | Merge pull request #49 from abutcher/pcs-restart-master2Jason DeTiberus2015-11-062-3/+56
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Start to handle pacemaker ha during upgradeAndrew Butcher2015-11-062-3/+56
| | |/ / / / / / /
| * / / / / / / / Fix apiLevels modificationsJason DeTiberus2015-11-061-7/+3
| |/ / / / / / /
| * | | | | | | add master_hostnames definition for upgradeJason DeTiberus2015-11-051-0/+4
| * | | | | | | Additional upgrade enhancementsJason DeTiberus2015-11-053-72/+101
| * | | | | | | Handle backups for separate etcd hosts if necessary.Devan Goodwin2015-11-051-9/+27
| * | | | | | | Further upgrade improvementsJason DeTiberus2015-11-051-46/+168
| * | | | | | | Upgrade improvementsDevan Goodwin2015-11-054-101/+93
* | | | | | | | Merge pull request #830 from detiber/nov1beta3Brenton Leanhardt2015-11-061-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | apiLevel changesJason DeTiberus2015-11-061-3/+3
* | | | | | | | | Merge pull request #796 from abutcher/master-proxy-certsBrenton Leanhardt2015-11-061-9/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issue with master.proxy-client.{crt,key} and omit.Andrew Butcher2015-11-021-9/+14
* | | | | | | | | | Merge pull request #818 from abutcher/custom-certs-fixesBrenton Leanhardt2015-11-062-9/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix file check conditional.Andrew Butcher2015-11-051-1/+1
| * | | | | | | | | | Don't check for certs in data_dir just raise when they can't be found. Fix typo.Andrew Butcher2015-11-052-8/+3
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #836 from mwoodson/disk_checksMatt Woodson2015-11-061-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | more cleanup of namesMatt Woodson2015-11-061-2/+2
* | | | | | | | | | | Merge pull request #834 from mwoodson/disk_checksMatt Woodson2015-11-061-2/+2
|\| | | | | | | | | | | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | cleaned up network checksMatt Woodson2015-11-061-2/+2
* | | | | | | | | | Merge pull request #832 from mwoodson/disk_checksMatt Woodson2015-11-063-4/+64
|\| | | | | | | | |
| * | | | | | | | | added network checks. also updated item prototype code to support moreMatt Woodson2015-11-063-4/+64
* | | | | | | | | | Merge pull request #833 from brenton/BZ1278245Brenton Leanhardt2015-11-061-0/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Bug 1278245 - Failed to add node to existing env using atomic-openshift-insta...Brenton Leanhardt2015-11-061-0/+9
|/ / / / / / / / /
* | | | | | | | | Merge pull request #821 from smunilla/connect_toBrenton Leanhardt2015-11-064-36/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | atomic-openshift-installer: Better specification of ansible connection pointSamuel Munilla2015-11-064-36/+29
* | | | | | | | | | Merge pull request #829 from detiber/nov1beta3nfsBrenton Leanhardt2015-11-065-6/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove v1beta3 by default for kube_nfs_volumesJason DeTiberus2015-11-065-6/+17
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #831 from detiber/oopsBrenton Leanhardt2015-11-061-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix data_dir for 3.0 deploymentsJason DeTiberus2015-11-061-0/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #824 from detiber/lb_group_fixesBrenton Leanhardt2015-11-065-3/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix lb group related errorsJason DeTiberus2015-11-055-3/+11
|/ / / / / / / / /
* | | | | | | | | Merge pull request #823 from tdawson/2015-11-fix-conflictTroy Dawson2015-11-051-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | exclude atomic-openshift-installer from bin subpackageTroy Dawson2015-11-051-0/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #608 from abutcher/native-haBrenton Leanhardt2015-11-0529-53/+559
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert to defaultsAndrew Butcher2015-11-052-4/+3
| * | | | | | | | Various HA changes for pacemaker and native methods.Andrew Butcher2015-11-0521-102/+196
| * | | | | | | | Atomic Enterprise/OpenShift Enterprise merge updateJason DeTiberus2015-11-042-2/+2
| * | | | | | | | fix dueling controllers - without controllerLeaseTTL set in config, multiple ...Jason DeTiberus2015-11-044-1/+8
| * | | | | | | | default to source persistence for haproxyJason DeTiberus2015-11-041-1/+1
| * | | | | | | | hardcode openshift binaries for nowJason DeTiberus2015-11-043-5/+13
| * | | | | | | | more tweaksJason DeTiberus2015-11-042-3/+6
| * | | | | | | | more tweaksJason DeTiberus2015-11-0411-56/+94
| * | | | | | | | additional ha related updatesJason DeTiberus2015-11-048-14/+182
| * | | | | | | | additional native ha changesAndrew Butcher2015-11-043-7/+7
| * | | | | | | | Start of true master haJason DeTiberus2015-11-049-4/+183
| * | | | | | | | Atomic Enterprise related changes.Avesh Agarwal2015-11-046-6/+16