On Fri, May 08, 2015 at 04:09:57PM +0200, 'Hrvoje Ribicic' via ganeti-devel wrote: > commit fea9a8347f53e0439da6209173774ab5b9d19478 > Merge: 1d0abda ebeed78 > Author: Hrvoje Ribicic <[email protected]> > Date: Fri May 8 14:05:17 2015 +0000 > > Merge branch 'stable-2.12' into stable-2.13 > > * 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 > > Conflicts: > test/py/ganeti.backend_unittest.py > > Resolution: > Merge all test changes.
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
