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 18295ba4b99cecdb44982fa5083d764c79dd25f4 (commit)
via d65da96a3402db5d3e2eec9fc65cf20f58a1942f (commit)
via fa37a4f497645a5dfd479db59d89d54aa4ffbdca (commit)
via 1ae0c2fa03e934d556d1d30de52ae3ccd587577e (commit)
via a846579a59273d0641b2a1c015438b72ea754ea4 (commit)
via 1df15a83a1a43b821ca048cd49e1cf245d41b908 (commit)
via cff30c6c8c17b45399f8b0ccf52f9e8ba1c2644a (commit)
from bbd876d6384d60c6bdf614bf489d6d1323998491 (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 18295ba4b99cecdb44982fa5083d764c79dd25f4
Merge: bbd876d d65da96
Author: Niklas Hambuechen <[email protected]>
Date: Mon Nov 24 18:41:49 2014 +0100
Merge branch 'stable-2.13' into master
* stable-2.13
Build confd by default
NEWS: Mention job filters and ad-hoc filtering
Makefile: Fix unconditional metad files in ENABLE_METADATA
* stable-2.12
Fix hlint warnings found by hlint 1.9.11
Make watcher identify itself on disk activation
Conflicts:
configure.ac
lib/cmdlib/cluster/verify.py
For configure.ac, the changed section regarding confd dependencies
was removed.
For verify.py, its contents were moved to lib/cmdlib/cluster/__init__.py
so the ENABLE_CONFD bit was removed from that one.
The cabal file and Makefile.am were adjusted to remove the confd flag.
Signed-off-by: Niklas Hambuechen <[email protected]>
Reviewed-by: Petr Pudlak <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 39 +++++++++++++++++++------------------
NEWS | 10 +++++++++
autotools/build-bash-completion | 5 +--
cabal/ganeti.template.cabal | 9 +-------
configure.ac | 39 +------------------------------------
daemons/daemon-util.in | 15 +-------------
lib/client/gnt_node.py | 5 ----
lib/cmdlib/cluster/__init__.py | 3 --
lib/tools/burnin.py | 5 +---
lib/watcher/__init__.py | 9 +++++--
lib/watcher/nodemaint.py | 4 ---
src/AutoConf.hs.in | 3 --
src/Ganeti/Constants.hs | 3 --
test/py/daemon-util_unittest.bash | 13 +----------
14 files changed, 44 insertions(+), 118 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.
