• Helga Velroyen's avatar
    Merge branch 'stable-2.13' into stable-2.14 · 71617ccd
    Helga Velroyen authored
    * stable-2.13
      Mention migration change in NEWS
      Move misplaced NEWS entry
      Add protection against daemons that may already be listening
      Attempt to cleanup failed migrations using a pidfile
      Add utility that gets the full command line of a process
      Introduce socat as a way of doing xl migrations
      fix typo in UPGRADE notes
      During start, only update job file locally
    
    * stable-2.12
      Fix tests for setting (shared) file storage directory
      Add missing call for setting shared file storage directory
      Update ganeti-luxid synopsis
      Update ganeti-mond synopsis
      Update ganeti-confd synopsis
      Update copyright statement
    
    Conflicts:
      NEWS
      lib/cmdlib/cluster/verify.py
    
    Resolutions:
      NEWS: keep all released entries
      lib/cmdlib/cluster/verify.py: put the additional line
        that caused the confict into
        lib/cmdlib/cluster/__init__.py
    Signed-off-by: default avatarHelga Velroyen <helgav@google.com>
    Reviewed-by: default avatarPetr Pudlak <pudlak@google.com>
    71617ccd
Name
Last commit
Last update
..
hv_kvm Loading commit data...
__init__.py Loading commit data...
hv_base.py Loading commit data...
hv_chroot.py Loading commit data...
hv_fake.py Loading commit data...
hv_lxc.py Loading commit data...
hv_xen.py Loading commit data...