]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b25ce10 c85a128)
Merge remote-tracking branch 'luiz/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 15 Apr 2013 12:49:21 +0000 (07:49 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 15 Apr 2013 12:49:22 +0000 (07:49 -0500)
commitc530b1423b86f1589c49bccb460a75cb87322562
treeaa44a2532469cf3d4d5a29c34f1397bc6eefc07atree
parentb25ce104a2ea690d77b1803cc829fee3142b310dcommit | diff
parentc85a128480a3d05d2002728c449a32e32663e7decommit | diff
Merge remote-tracking branch 'luiz/queue/qmp' into staging

# By Michal Novotny (2) and Eric Blake (1)
# Via Luiz Capitulino
* luiz/queue/qmp:
  qapi: use valid JSON in schema
  Revert "New QMP command query-cpu-max and HMP command cpu_max"
  New cpu-max field in query-machines QMP command output

Message-id: 1365775103-18737-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Qemu copy for testing