This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Ganeti core".
The branch, master has been updated
via 41a08b839a429529a2742bc0dc2629a0908fe89a (commit)
via dc3d810855714300cd3db7c0e6d97f3baacd3594 (commit)
via 59acce3885436d6450d9cf5e159668a97509898a (commit)
via 0e83bab653902bf9b7b8fd16f89bfd52e4952532 (commit)
via c57cdced876c7ea7c00dda1b85386bae170c40bc (commit)
via 6e06de4e7efbb037b9a46b8c2063a05b2921d94f (commit)
via 6a2990365f02153eca7bbbb24dd9caa4a3026578 (commit)
via fef5c09ec3c0595f90889957e424cbd08cff5fc4 (commit)
via 990d128a1f7e5f07c9ea7ff71e19a781529160b4 (commit)
via 589d5cd4e84a140e166744e91fe5127eedffcbb2 (commit)
via b7aa0fd405585079c1dee049aad6c2185c7884e5 (commit)
via 33dd894d0e612fbb1874a174fd39f4dda3813264 (commit)
via 63a59b583b947a51b8f22d455491fcdc233001e6 (commit)
via a8f2733bd00c5f18be1f0203c945db5e748eb19f (commit)
via d9ef8346d6ffa54ca242c5a03a3b1c39211420f6 (commit)
via 29625e5a615b5b2976afd4933c33c1668a3bf05b (commit)
via 742dc8deb663d0961de1f05cfec9ca24f6a9a881 (commit)
from 621c5075a211984f0a37957681e9a215e7464952 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 41a08b839a429529a2742bc0dc2629a0908fe89a
Merge: 621c507 dc3d810
Author: Klaus Aehlig <[email protected]>
Date: Wed Oct 8 14:15:56 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.9
Ganeti.Daemon: always install SIGHUP handler
* stable-2.10
ganeti.daemon: fix daemon mode with GnuTLS >= 3.3
Fix DRBD version check for non VM capable nodes
Fix invalid message from gnt-os
Renaming NV_VMNODES to NV_NONVMNODES
Node names in NV_VMNODES
* stable-2.11
Remove misleading cleanup
systemd: start kvmd by default
Fix failing BGL whitelist test
Remove BGL from LUInstanceRename
Factor out instance existence checks
Allow coexistence of adding and acquiring locks
Allow _LockList to handle locking.ALL_SET
Conflicts:
lib/cmdlib/instance.py
lib/cmdlib/instance_utils.py
lib/mcpu.py
test/py/ganeti.mcpu_unittest.py
Resolution:
test/py/ganeti.mcpu_unittest.py and
lib/cmdlib/instance_utils.py trivial;
rest: take master (the only changes in
the lower branches to those files
where cherry-picks).
Signed-off-by: Klaus Aehlig <[email protected]>
Reviewed-by: Petr Pudlak <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
doc/examples/systemd/ganeti-kvmd.service.in | 4 ++--
lib/backend.py | 2 +-
lib/client/gnt_os.py | 4 ++--
lib/cmdlib/cluster.py | 7 ++++---
lib/cmdlib/instance_utils.py | 1 -
lib/config.py | 11 ++++++++++-
lib/daemon.py | 18 +++++++++++++++++-
qa/ganeti-qa.py | 1 -
src/Ganeti/Constants.hs | 4 ++--
src/Ganeti/Daemon.hs | 2 +-
10 files changed, 39 insertions(+), 15 deletions(-)
hooks/post-receive
--
Ganeti core
--
---
You received this message because you are subscribed to the Google Groups
"ganeti-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
