Revision 4c1a504b
ID | 4c1a504b93287ef72ab343c266432085f6a37a3b |
Merge branch 'devel-2.0' into devel-2.1
- devel-2.0:
Fix the mocks.py for 2.0 unittests
LURemoveNode safety in face of wrong node list
Fix an unsafe formatting bug
Ensure all int/float conversions are handled right
Conflicts:
lib/backend.py - trivial merge
lib/cmdlib.py - merge, and took 2.0's version of LURemoveNode
BuildHooksEnv
lib/mcpu.py - kept ours
lib/objects.py - trivial merge
lib/utils.py - trivial merge
scripts/gnt-backup - kept ours
scripts/gnt-instance - trivial merge
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
Files
- added
- modified
- copied
- renamed
- deleted