Revision fd5578ee
ID | fd5578ee39e2084fbab8aa43ca824db119f7d4ec |
Parent | 3daaab6c, e6e17529 |
Child | 87f2f426 |
Merge branch 'stable-2.8' into stable-2.9
- stable-2.8
Improve job status assert affected by race condition
Export and import Disk/NIC name
Fix backup import in case NIC is inside a network
Override get() method of ConfigParser
Conflicts:
lib/cmdlib/instance.py: manually apply 0973f9ed on
the stable-2.9 version
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>
Files
- added
- modified
- copied
- renamed
- deleted