Revision 047686c5
| ID | 047686c52c0897a28baf36c8d2883e4a4a69aa80 |
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>
Files
- added
- modified
- copied
- renamed
- deleted