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 8eafdd519ee8078120475ce7df6114582ac8f059 (commit)
via 6d5cede164a93927310e445c99d5110cd76639a4 (commit)
via bd1d7b91e306b19e3ebbdab9015e9a4d6d24aab3 (commit)
via f4bdea4927f1755b79906a3c5774335525db330f (commit)
via e0a71e63d7d372bd0ce350b83ae751f42d706596 (commit)
via 233228c1790e7b7c0d6bbece866130053cd3abd6 (commit)
via b194307a95e8fc933f62da682c6168f0409b39ca (commit)
via 7e85fa9bd24f78b704b11cb6faef0556ee94e3df (commit)
via d22f60921188b034fc38832c49bcd57725f66b73 (commit)
from 9aba03578e77c889b37353d30308f3289371257a (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 8eafdd519ee8078120475ce7df6114582ac8f059
Merge: 9aba035 6d5cede
Author: Klaus Aehlig <[email protected]>
Date: Mon Oct 13 21:12:46 2014 +0200
Merge branch 'stable-2.12' into master
* stable-2.12
Also clean up stale livelock files
Add a function to list livelock files found on the system
Change monitoring test invocation
Make parallel performance rename test more serial
Break up parallel performance QA tests
Readd instance removal
Set SO_REUSEADDR in ConfD
Add systemd unit files to EXTRA_DIST
Conflicts:
src/Ganeti/WConfd/DeathDetection.hs
Resolution:
add newly added cleanup of stale files to
cleanupLocksTask, leaving cleanupLocks
unchanged.
Signed-off-by: Klaus Aehlig <[email protected]>
Reviewed-by: Niklas Hambuechen <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 4 +++
qa/ganeti-qa.py | 38 +++++++++++++++++++++-------------
qa/qa_performance.py | 2 +-
src/Ganeti/Confd/Server.hs | 1 +
src/Ganeti/Utils/Livelock.hs | 16 ++++++++++++-
src/Ganeti/WConfd/DeathDetection.hs | 10 +++++++++
6 files changed, 53 insertions(+), 18 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.
