Skip to content
  • Bernardo Dal Seno's avatar
    Merge branch 'stable-2.8' into master · 1bb99a33
    Bernardo Dal Seno authored
    * stable-2.8: (45 commits)
      Update NEWS with disk creation fixes
      Sort cmdlib-related entries in Makefile.am
      cmdlib: Cleanup public/private functions
      cmdlib: Extract instance query related functionality
      cmdlib: Extract instance operation functionality
      cmdlib: Extract migration related functionality
      cmdlib: Extract storage related functionality
      Reformat and define exports in cmdlib/__init__.py
      Extract miscellaneous logical units from cmdlib
      Extract os related logical units from cmdlib
      Extract query related logical units from cmdlib
      Extract backup related logical units from cmdlib
      Extract instance related logical units from cmdlib
      Extract node related logical units from cmdlib
      Extract group related logial units from cmdlib
      Extract cluster related logical units from cmdlib
      Extract test logical units from cmdlib
      Extract network related logical units from cmdlib
      Extract tags related logical units from cmdlib
      Extract base classes from cmdlib
      ...
    
    Conflicts:
    	devel/build_chroot
    	lib/cmdlib.py
    
    devel/build_chroot is straightforward: one side has added versions, the
    other has added one library. lib/cmdlib.py has been split in many files in
    stable-2.8, so I've semi-manually applied the changes from master.
    
    This merge also fixes a problem with merge f2d87a5e, which partially
    reverted changes from 912737ba
    
     by mistake.
    
    Signed-off-by: default avatarBernardo Dal Seno <bdalseno@google.com>
    Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
    1bb99a33