]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46a5801 e1c37d0)
Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Mar 2012 13:51:06 +0000 (08:51 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 19 Mar 2012 13:51:06 +0000 (08:51 -0500)
* qmp/queue/qmp:
  qapi: Convert migrate
  Purge migration of (almost) everything to do with monitors
  Error: Introduce error_copy()
  QError: Introduce new errors for the migration command


Trivial merge
Qemu copy for testing