[Pkg-ganeti-devel] [ganeti] 137/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 a92128199957ffcba0f0daddee8af2fad89fdf86
Merge: 7b5a7e0 32a82f7
Author: Petr Pudlak <pudlak at google.com>
Date:   Tue Jun 30 15:05:56 2015 +0200

    Merge branch 'stable-2.14' into stable-2.15
    
    * stable-2.14
      Follow the name change of _CheckHostnameSane
    
    * stable-2.13
      Full QuickCheck 2.7 compatibility
      QuickCheck 2.7 compatibility
      Bump revision number to 2.13.1
      Update NEWS file for the 2.13.1 release
    
    * stable-2.12
      Update design doc with solution for Issue 1094
      Prevent multiple communication nics for one instance
      Remove outdated reference to ganeti-masterd
      Update ganeti-luxid man page
      Add a man page for ganeti-wconfd
      Make htools tolerate missing "dtotal" and "dfree" on luxi
      Get QuickCheck 2.7 compatibility
      TestCommon: Fix QuickCheck import warnings
      Full QuickCheck 2.7 compatibility
      Add a CPP macro for checking the version of QuickCheck
      QuickCheck 2.7 compatibility
      Fix name of filter-evaluation function
      Call the filter again with runtime data this time
      Fix user and group ordering in test
    
    * stable-2.11
      Downgrade log-message for rereading job
      Dowgrade log-level for successful requests
    
    Signed-off-by: Petr Pudlak <pudlak at google.com>
    Reviewed-by: Helga Velroyen <helgav at google.com>

 Makefile.am                    |  1 +
 NEWS                           | 40 ++++++++++++++++++++++++++++
 doc/design-node-security.rst   | 59 ++++++++++++++++++++++++++++--------------
 lib/cmdlib/instance_create.py  | 32 +++++++++++++----------
 man/footer.rst                 |  2 +-
 man/ganeti-luxid.rst           | 17 +++++-------
 man/ganeti-wconfd.rst          | 48 ++++++++++++++++++++++++++++++++++
 src/Ganeti/JQScheduler.hs      |  2 +-
 src/Ganeti/Query/Query.hs      | 10 ++++---
 src/Ganeti/UDSServer.hs        |  2 +-
 test/hs/Test/Ganeti/Runtime.hs |  4 +--
 11 files changed, 164 insertions(+), 53 deletions(-)


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