projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 49e4c83 ab92578)
Merge branch 'devel-2.3'
authorMichael Hanselmann <hansmi@google.com>
Fri, 7 Jan 2011 10:12:05 +0000 (11:12 +0100)
committerMichael Hanselmann <hansmi@google.com>
Fri, 7 Jan 2011 10:27:18 +0000 (11:27 +0100)
commit047686c52c0897a28baf36c8d2883e4a4a69aa80
tree2ca48c74239368439e6cfe92bf133ddd65584c11tree | snapshot
parent49e4c83706617695dc9937c093ff3537e399e859commit | diff
parentab92578a60fd9dd0ecaa802f76981d7160da17cdcommit | diff
Merge branch 'devel-2.3'

* devel-2.3:
  Remove unused import from client.gnt_instance
  gnt-instance console: Improve error reporting
  Increase timeout for connection on remote import
  import-export: Improve timeout error reporting

Conflicts:
lib/cmdlib.py: Trivial
lib/opcodes.py: Trivial

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
daemons/import-export diff1 | diff2 | blob | history
lib/client/gnt_instance.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.