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.11 has been updated
via fff9607c18b48f7178888ba68d59afcc22e7f8db (commit)
via 845868232610febc857960c09d2d1bc7e1f858df (commit)
via 7c58bd7e0f9fffb19faeb0dd1521922aaf223938 (commit)
from c4b5c163865e4368959622a8fc25275f4a7dd2a8 (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 fff9607c18b48f7178888ba68d59afcc22e7f8db
Merge: c4b5c16 8458682
Author: Klaus Aehlig <[email protected]>
Date: Mon Dec 1 21:58:36 2014 +0100
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
Fix hlint warnings found by hlint 1.9.11
Only check header for non-generated files
Conflicts:
src/Ganeti/Utils.hs (trivial)
Signed-off-by: Klaus Aehlig <[email protected]>
Reviewed-by: Niklas Hambuechen <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 3 ++-
src/Ganeti/HTools/Program/Hroller.hs | 2 +-
src/Ganeti/Hypervisor/Xen/Types.hs | 6 +++---
src/Ganeti/Utils.hs | 4 ++--
test/hs/Test/Ganeti/Hypervisor/Xen/XmParser.hs | 2 +-
5 files changed, 9 insertions(+), 8 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.
