projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa0003d 14b5d45)
Merge branch 'stable-2.6' into devel-2.6
authorIustin Pop <iustin@google.com>
Fri, 7 Sep 2012 21:13:15 +0000 (06:13 +0900)
committerIustin Pop <iustin@google.com>
Fri, 7 Sep 2012 21:13:21 +0000 (06:13 +0900)
* stable-2.6:
  Fix bug in non-mirrored instance allocation
  Fix gnt-debug iallocator

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Agata Murawska <agatamurawska@google.com>

1  2 
lib/cmdlib.py patch | diff1 | diff2 | blob | history

diff --cc lib/cmdlib.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.