• Klaus Aehlig's avatar
    Merge branch 'stable-2.10' into stable-2.11 · 866e1f76
    Klaus Aehlig authored
    * 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
    
    * stable-2.9
      KVM: set IFF_ONE_QUEUE on created tap interfaces
      Add configure option to pass GHC flags
    
    Conflicts:
    	Makefile.am
    	configure.ac
    	qa/qa_utils.py
    Resolution:
    	Take ALL the additions
    Semantical conflict:
    	make hsqueeze use the modified tryBalance signature
    Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
    Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
    866e1f76
hbal.rst 28.8 KB