• Klaus Aehlig's avatar
    Merge branch 'stable-2.11' into stable-2.12 · 0eab2c0d
    Klaus Aehlig authored
    
    
    * stable-2.11
      Fix invalid use of RpcResult.Raise
      Bump revision to 2.11.5
      Prepare NEWS file for 2.11.5 release
    
    * stable-2.10
      On upgrades, check for upgrades to resume first
      Pause watcher during upgrade
      Allow instance disks to be added with --no-wait-for-sync
      Bump revision to 2.10.7
      Prepare NEWS file for 2.10.7 release
      Fix lint error
      Create the config backup archive in a safe way
    
    Conflicts:
    	NEWS: take ALL the entries
    	configure.ac: ignore revision bump
    Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
    Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
    0eab2c0d
gnt_cluster.py 75 KB