projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c1f1985 72dc3fb)
Merge branch 'devel-2.5'
authorGuido Trotter <ultrotter@google.com>
Fri, 20 Jan 2012 17:36:51 +0000 (17:36 +0000)
committerGuido Trotter <ultrotter@google.com>
Fri, 20 Jan 2012 17:48:35 +0000 (17:48 +0000)
commit2ea64524ce79642a9361e15028094d35dc9abe8e
treea3426fce31ea72503cf6dd82bf9f7a9b13ee3e5btree | snapshot
parentc1f19851a74a657f9c1415e99ced9bab41ed610fcommit | diff
parent72dc3fb30a426a24dd05801de43fdf7b8758dc71commit | diff
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>
lib/cli.py diff1 | diff2 | blob | history
lib/cmdlib.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.