commit 84a8510d198f2f816efe0ebd2a1415aa0430ba9f
Merge: 81a3f39 da7e9a9
Author: Hrvoje Ribicic <[email protected]>
Date: Fri May 15 15:02:20 2015 +0200
Merge branch 'stable-2.15' into master
* stable-2.15
(no changes)
* 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
Hrvoje Ribicic
Ganeti Engineering
Google Germany GmbH
Dienerstr. 12, 80331, München
Geschäftsführer: Graham Law, Christine Elizabeth Flores
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg