commit d258769201920d10a192ea93df876b76f6c1055f
Merge: cdc8341 71617cc
Author: Helga Velroyen <[email protected]>
Date:   Mon Jun 15 16:07:40 2015 +0200

    Merge branch 'stable-2.14' into stable-2.15

    * stable-2.14
      (no changes)

    * 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

    Signed-off-by: Helga Velroyen <[email protected]>

Reply via email to