• Klaus Aehlig's avatar
    Merge branch 'stable-2.11' into stable-2.12 · 3648dad3
    Klaus Aehlig authored
    
    
    * 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:
    	doc/design-draft.rst
    	lib/hypervisor/hv_kvm/__init__.py
    	qa/qa_job_utils.py
    Resolution:
    	trivial, following code moves
    Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
    Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
    3648dad3
design-draft.rst 687 Bytes