On Wed, May 13, 2015 at 04:18:26PM +0200, 'Hrvoje Ribicic' via ganeti-devel wrote: > commit cd6445ccab0c3246f71222d67adde29a2854b4e9 > Merge: ff3f66b 32230f0 > Author: Hrvoje Ribicic <[email protected]> > Date: Wed May 13 14:15:20 2015 +0000 > > Merge branch 'stable-2.14' into stable-2.15 > > * stable-2.14 > Fix mismerge by correcting test import > > * stable-2.13 > (no changes) > > * stable-2.12 > Expand orphan volume test > Restrict Ganeti's orphan volume checks to the single VG > Modify UDS server startup to set permissions for sockets > Add wheezy chroot files to gitignore file > Makefile.am: Don't use -dynamic-too for .hpc_o files > Makefile.am: Don't use dots in -osuf > Fix compiler invocation for GHC >= 7.8 > Makefile.am: Fix wrong -dep-suffix for GHC 7.8 > Only upgrade configs not upgraded > Only unlock config if we did lock it > Mention preferred DRBD module settings when using Xen > Avoid assertIn > Test presence of public and private parameters > Put private parameters into the environment > Always close pipe on job forking > Clean up pipes early on failed forks >
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
