[Pkg-ganeti-devel] [ganeti] 129/165: Merge branch 'stable-2.14' into stable-2.15

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit 3c8f35e7c694f6c60d7b47b57ff71e4968d5c4a0
Merge: cdc8341 71617cc
Author: Helga Velroyen <helgav at google.com>
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 <helgav at google.com>
    Reviewed-by: Petr Pudlak <pudlak at google.com>

 COPYING                                      |   2 +-
 NEWS                                         |  28 +++----
 UPGRADE                                      |   2 +-
 lib/cmdlib/cluster/__init__.py               |   1 +
 lib/constants.py                             |  11 ---
 lib/hypervisor/hv_xen.py                     | 119 +++++++++++++++++++++++----
 lib/utils/process.py                         |  18 ++++
 man/footer.rst                               |   2 +-
 man/ganeti-confd.rst                         |   3 +-
 man/ganeti-luxid.rst                         |   3 +-
 man/ganeti-mond.rst                          |   2 +-
 src/Ganeti/Constants.hs                      |   6 ++
 src/Ganeti/JQScheduler.hs                    |   2 +-
 src/Ganeti/JQueue.hs                         |   8 +-
 test/py/cmdlib/cluster_unittest.py           |  31 +++++++
 test/py/ganeti.hypervisor.hv_xen_unittest.py |  21 ++---
 test/py/ganeti.utils.process_unittest.py     |  21 +++--
 17 files changed, 209 insertions(+), 71 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git