Revision 2ea64524
ID | 2ea64524ce79642a9361e15028094d35dc9abe8e |
Merge branch 'devel-2.5'
- devel-2.5:
Migrate: don't check for free memory on cleanup
Revert "cli: Disable abbreviation matching for options"
Conflicts:
lib/cli.py
- trivial
lib/cmdlib.py
- merge new condition
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
Files
- added
- modified
- copied
- renamed
- deleted