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, stable-2.12 has been updated
       via  dc3d810855714300cd3db7c0e6d97f3baacd3594 (commit)
       via  59acce3885436d6450d9cf5e159668a97509898a (commit)
       via  0e83bab653902bf9b7b8fd16f89bfd52e4952532 (commit)
       via  6e06de4e7efbb037b9a46b8c2063a05b2921d94f (commit)
       via  fef5c09ec3c0595f90889957e424cbd08cff5fc4 (commit)
       via  a8f2733bd00c5f18be1f0203c945db5e748eb19f (commit)
       via  d9ef8346d6ffa54ca242c5a03a3b1c39211420f6 (commit)
       via  29625e5a615b5b2976afd4933c33c1668a3bf05b (commit)
       via  742dc8deb663d0961de1f05cfec9ca24f6a9a881 (commit)
      from  c57cdced876c7ea7c00dda1b85386bae170c40bc (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 dc3d810855714300cd3db7c0e6d97f3baacd3594
Merge: c57cdce 59acce3
Author: Petr Pudlak <[email protected]>
Date:   Tue Oct 7 15:05:46 2014 +0200

    Merge branch 'stable-2.11' into stable-2.12
    
    * 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.9
      Ganeti.Daemon: always install SIGHUP handler
    
    Conflicts:
        lib/config.py: Replace 2.11 annotations with 2.12 annotations
    
    Signed-off-by: Petr Pudlak <[email protected]>
    Reviewed-by: Helga Velroyen <[email protected]>

-----------------------------------------------------------------------

Summary of changes:
 lib/backend.py          |    2 +-
 lib/client/gnt_os.py    |    4 ++--
 lib/cmdlib/cluster.py   |    7 ++++---
 lib/config.py           |   11 ++++++++++-
 lib/daemon.py           |   18 +++++++++++++++++-
 src/Ganeti/Constants.hs |    4 ++--
 src/Ganeti/Daemon.hs    |    2 +-
 7 files changed, 37 insertions(+), 11 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.

Reply via email to