• Guido Trotter's avatar
    Merge branch 'master' into next · 8486ffc0
    Guido Trotter authored
    
    
    * master:
      Update NEWS and version for 2.0.3 release
      devel/upload: revert rsync -p
      export: add meaningful exit code
      Fix detecting of errors in export
      Implement gnt-cluster check-disk-sizes
      rpc: add rpc call for getting disk size
      bdev: Add function for reading actual disk size
      Implement --ignore-size in activate-disks
      Add ignore size support in _AssembleInstanceDisks
      Add a objects.Disk.UnsetSize() method
      bdev: allow ignoring of size in Assemble()
      Fix instance import net option
      Simplify the devel/upload script
      Add a Copy method to object.ConfigObject
      Extend call_node_start_master rpc with no_voting
    
    Conflicts:
    
      daemons/ganeti-masterd
        s/SimpleConfigReader/SimpleStore/ VS start-master no-voting
        (kept both)
    Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
    8486ffc0
Makefile.am 9.64 KB