Skip to content
  • Iustin Pop's avatar
    Merge remote branch 'origin/master' into mogu · c8872a0b
    Iustin Pop authored
    
    
    * origin/master:
      Fix burnin's verbose mode
      Final NEWS update and version increase for 2.0.4
      Encode the actual exception raised by LU execution
      Move the luxi error handling into errors.py
      Fix the confusing ssh/hostname message in node add
      Add man page for ganeti-cleaner
      Update NEWS file for version 2.0.4
      Automatically cleanup _temporary_ids at save
      Separate the computation of all config IDs
      Change config upgrade to be explicit
      Fix unittest breakage due to new test file
      Fix /proc/drbd parsing in presence of gaps
      repair-size: ensure child disks have sane sizes
      Fix yet another bug in LURepairDiskSizes
      Fix a bug in LURepairDiskSizes
    
    Conflicts:
    	NEWS          (trivial, the RST change)
    	lib/cmdlib.py (trivial, some small change in 2.0)
    	lib/config.py (due to the cherry-picks and UUID changes in 2.1)
    
    Signed-off-by: default avatarIustin Pop <iustin@google.com>
    c8872a0b