projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 29a3053 112b6e8)
Merge branch 'devel-2.6' into master
authorIustin Pop <iustin@google.com>
Mon, 12 Nov 2012 16:11:17 +0000 (17:11 +0100)
committerIustin Pop <iustin@google.com>
Mon, 12 Nov 2012 16:17:44 +0000 (17:17 +0100)
commit551a29dfe3b105ac264d74e173da0008cbbfa86b
treee26c898343406bd6369979b7dec6f1eb60c64a78tree | snapshot
parent29a3053378d72e6897799c16fe61d136b28ca1e0commit | diff
parent112b6e89946525b8ff7cac62abdc4bd2afb54f01commit | diff
Merge branch 'devel-2.6' into master

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

Conflicts (both trivial):
        htools/Ganeti/Daemon.hs (_writePidFile rename)
        lib/hypervisor/hv_kvm.py (master fixed an indentation issue)

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