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.12 has been updated
via 7c0280159f255ef922a76df91cd32116619ecad8 (commit)
via cd0d5ce51e252f49060f8e67ac633956577f2020 (commit)
via 9158b5b9aab1c4704021c805e23cd49866e3cc4c (commit)
via 9f8f740badef379888757345a703bf979339d106 (commit)
via 421ab83e4c429ab5df59c77dee28800b9b60b670 (commit)
from c8feab6bf2a60989547f9d1544ebb33421916156 (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 7c0280159f255ef922a76df91cd32116619ecad8
Merge: c8feab6 cd0d5ce
Author: Klaus Aehlig <[email protected]>
Date: Thu Oct 16 13:32:56 2014 +0200
Merge branch 'stable-2.11' into stable-2.12
* stable-2.11
break too long line
Read if IPv6 is used directly in SshRunner
* stable-2.10
Check the return value of query in ConnectToInstanceConsole
Conflicts:
lib/client/gnt_instance.py
Resolution:
follow the client switch
Signed-off-by: Klaus Aehlig <[email protected]>
Reviewed-by: Hrvoje Ribicic <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
lib/bootstrap.py | 9 ++++-----
lib/client/gnt_instance.py | 7 +++++--
lib/ssh.py | 8 ++++----
3 files changed, 13 insertions(+), 11 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.
