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 9158b5b9aab1c4704021c805e23cd49866e3cc4c (commit)
via 421ab83e4c429ab5df59c77dee28800b9b60b670 (commit)
from 9f8f740badef379888757345a703bf979339d106 (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 9158b5b9aab1c4704021c805e23cd49866e3cc4c
Merge: 9f8f740 421ab83
Author: Klaus Aehlig <[email protected]>
Date: Wed Oct 15 15:44:09 2014 +0200
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
Check the return value of query in ConnectToInstanceConsole
Conflicts:
lib/client/gnt_instance.py
Resolution:
follow the switch to query socket
Signed-off-by: Klaus Aehlig <[email protected]>
Reviewed-by: Niklas Hambuechen <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
lib/client/gnt_instance.py | 7 +++++--
1 files changed, 5 insertions(+), 2 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.
