projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2210582 4041a4e)
Merge branch 'stable-2.6' into devel-2.6
authorIustin Pop <iustin@google.com>
Mon, 12 Nov 2012 14:13:39 +0000 (15:13 +0100)
committerIustin Pop <iustin@google.com>
Mon, 12 Nov 2012 16:05:18 +0000 (17:05 +0100)
commit112b6e89946525b8ff7cac62abdc4bd2afb54f01
tree40c98c61a6168cef5392abcadc7a3494109fe841tree | snapshot
parent22105827ef1456eae18c8ab92b54c8b421247ab9commit | diff
parent4041a4e3ca7181fc0158af176e546a9a67abcdd9commit | diff
Merge branch 'stable-2.6' into devel-2.6

* stable-2.6:
  Improve error message when migration status fail
  Fix type error in kvm/GetMigrationStatus
  Fix PID file writing in Haskell daemons

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
lib/cmdlib.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.