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 c65155e949953b8eb0ffd34df0f1e70a04c47999 (commit)
via f4a1dff10d6f92a93017bda7143bf00a868d6691 (commit)
via 87e5a7c982aee3cbaa92b22e64e9b1cba2c93df1 (commit)
via 2e1f86540c74691b35e67990ba9b463dd4ebb09a (commit)
via ea7f957599b6cc59c1a47edca6c12767d4d32339 (commit)
via 0d4b54bdf6376deb0eccb99af439e261e439323d (commit)
via 82142857c0e5f81ef793a4c50e0d04b0476c4745 (commit)
from d59dd394774a1da67edad24b06e2c003283bbdba (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 c65155e949953b8eb0ffd34df0f1e70a04c47999
Merge: d59dd39 f4a1dff
Author: Klaus Aehlig <[email protected]>
Date: Tue Sep 23 11:26:28 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.11
Bump revision bump 2.11.6
Pepare NEWS entry for a 2.11 point release
* stable-2.12
Make watcher identify itself on disk verification
Suffix bump for 2.12.0~rc2
Prepare NEWS file for 2.12.0~rc1
Conflicts:
configure.ac: ignore suffix bump
Signed-off-by: Klaus Aehlig <[email protected]>
Reviewed-by: Helga Velroyen <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
NEWS | 73 ++++++++++++++++++++++++++++++++++++++--------
lib/watcher/__init__.py | 8 ++++-
2 files changed, 66 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.
