commit 0b037f972eb3430b53d65ab37738e1fef5e3cf80
Merge: 8f4dc99 42f09de
Author: Klaus Aehlig <[email protected]>
Date: Fri May 9 15:52:29 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.12
Do export _GetOutputFromMaster
Clean up remove_locks
Recursively clear serial numbers
* stable-2.11
Add hsqueeze to NEWS
kvm: use a dedicated QMP socket for kvmd
Add design-node-security.rst to docinput
* stable-2.10
Test parallel instance ops and plain instances
Test parallel creation of DRBD instances
Test parallel job submission performance
Test parallel instance query operations
Test parallel instance operations
Test parallel instance modification
Test parallel node-count instance creation
Test parallel instance creation and removal
Fail in replace-disks if attaching disks fails
Add a basic test for --restricted-migration
Describe the --restricted-migration option
Support restricted migration
Add an option for restricted migration
Add an example for node evacuation
Add a test for parsing version strings
Set correct Ganeti version on setup commands
Add a utility to combine shell commands
Add design doc for performance tests
* stable-2.9
KVM: set IFF_ONE_QUEUE on created tap interfaces
Add configure option to pass GHC flags
Conflicts:
tools/cfgupgrade: do not downgrade
Signed-off-by: Klaus Aehlig <[email protected]>
--
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
