projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 13cc7b8 fdb85e3)
Merge branch 'devel-2.7'
authorBernardo Dal Seno <bdalseno@google.com>
Thu, 21 Mar 2013 09:42:16 +0000 (10:42 +0100)
committerBernardo Dal Seno <bdalseno@google.com>
Thu, 21 Mar 2013 10:13:11 +0000 (11:13 +0100)
commit05b6f4d8eefe27077a8832e720220554c0c3ce38
tree773d51759d3490708c8d0a97e96a7d8a1474f3c1tree | snapshot
parent13cc7b847790c52a98aa36cd34c53af013c80f65commit | diff
parentfdb85e3da8594197d3446a0e60bba23cbdbea150commit | diff
Merge branch 'devel-2.7'

* devel-2.7
  cfgupgrade: Fix error messages
  Update "FIXME" string in RAPI
  rapi client: add target_node to migrate instance
  Make diskless instances externally mirrored
  Fix migrate/failover -n for ext mirror storage

Trivial merge: no conflicts

Signed-off-by: Bernardo Dal Seno <bdalseno@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>
lib/cmdlib.py diff1 | diff2 | blob | history
lib/constants.py diff1 | diff2 | blob | history
lib/rapi/client.py diff1 | diff2 | blob | history
lib/rapi/rlib2.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.