projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cb92e7a 54c31fd)
Merge branch 'stable-2.5' into devel-2.5
authorMichael Hanselmann <hansmi@google.com>
Thu, 24 Nov 2011 08:40:10 +0000 (09:40 +0100)
committerMichael Hanselmann <hansmi@google.com>
Thu, 24 Nov 2011 09:04:29 +0000 (10:04 +0100)
commit2b9245ffda3091a5b1b14f47a8c4b749a235177e
tree09f462be87be29f47ea6b69fcb6990278fd764e2tree | snapshot
parentcb92e7a14b7ee510dcc26c2a14dddaa0fa8f10e4commit | diff
parent54c31fd3ce69f3e9eefa1c5b856c4e66ecf776bccommit | diff
Merge branch 'stable-2.5' into devel-2.5

* stable-2.5:
  LUGroupAssignNodes: Fix node membership corruption
  Fix pylint warning on unreachable code
  LUNodeEvacuate: Disallow migrating all instances at once
  LUNodeEvacuate: Locking fixes
  Fix error when removing node

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: René Nussbaumer <rn@google.com>
lib/cmdlib.py diff1 | diff2 | blob | history
lib/config.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.