On Tue, Jun 02, 2015 at 05:56:53PM +0200, 'Petr Pudlak' via ganeti-devel wrote: > commit 7e2dd310deb4d44a764b98dae26f567919196df1 > Merge: ae52a3a bd40455 > Author: Petr Pudlak <[email protected]> > Date: Tue Jun 2 17:47:37 2015 +0200 > > Merge branch 'stable-2.15' into master > > * stable-2.15 > Allow unconditional failovers off offline nodes, again > > * stable-2.14 > Suffix bump for 2.14.0 > Prepare NEWS for 2.14.0 release > Get QuickCheck 2.7 compatibility > For instances use the real instance disk template > Log iAllocator request at debug level > Do not assume all requests are relocation requests > In opportunistic locking, update NODE_RES locks after nodes > Suffix bump for 2.14.0~rc2 > Prepare NEWS for 2.14.0~rc2 > > * stable-2.13 > Increase waiting time to avoid races > Avoid watcher interaction in TestFilterRateLimit > Avoid races in TestAdHocReasonRateLimit > Avoid races in TestFilterRateLimit > > * stable-2.12 > Make WConfD's updateLocksWaiting safe > Tests specifying safeUpdateLocksWaiting > Provide a repeatable version of updateLocksWaiting > Verify that updateLocks is idempotent > Always accept no-op requests > Allow unconditional failovers off offline nodes > Remove now unused variable > Fix bug in ssconf comparison, disable it for vcluster > QA: test renewing the cluster certificate only > QA: Assert equality of ssconf_master_candidate_certs > QA: Add more verify steps in renew crypto QA > Add a unit test for the Gluster storage type > Add missing Gluster storage verification checks > Add Gluster type to the node storage reporting set > Introduce the Gluster storage type > Make xend-config.sxp optional > Revision bump to 2.12.4 > Update NEWS for 2.12.4 > Ignore *.dyn* files generated by GHC 7.8 > Replace HFLAGS_NOPROF with HFLAGS_DYNAMIC in the Makefile > > * stable-2.11 > (no news) > > * stable-2.10 > Substitute 'suffix' for 'revision' > Check for gnt-cluster before running gnt-cluster upgrade > > Conflicts: > lib/cmdlib/cluster/verify.py > - merge: keep _VerifyExclusionTags from [6ce3bfcf] and > pylint disable from [ff36cac] > src/Ganeti/HTools/Cluster/Moves.hs > - merge: keep addSecExEx from [bd40455] and add `force` > introduced in [9322efb]
LGTM -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
