Skip to content
  • Klaus Aehlig's avatar
    Merge branch 'stable-2.12' into master · 30369fa6
    Klaus Aehlig authored
    
    
    * stable-2.12
      Fix alterContainerL
      Suffix bump for 2.12.0~rc1
      Prepare NEWS file for 2.12.0~rc1
      Relax cleanliness condition to allow the empty tree
      Add Debian 'testing' to the schroot build script
      Update the installation instructions
      Fix the Attoparsec import in THH.hs
      Re-read an instance object after starting its disks
      Allow replace-disks to work on offline instances
      Verify clean DATA_DIR on cluster init
    
    * stable-2.11
      (no changes)
    
    * stable-2.10
      Fix network info in case of multi NIC instances
    
    Conflicts:
    	configure.ac: ignore suffix bump
    	devel/build_chroot: use testing role to describe jessie
    
    Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
    Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
    30369fa6