Merge remote-tracking branch 'qmp/queue/qmp' into staging
commit645467842339207d895c41f4e4526507b95a636a
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 23 Apr 2012 19:29:11 +0000 (23 14:29 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 23 Apr 2012 19:29:11 +0000 (23 14:29 -0500)
tree4a14075cb3661f405d0515007da2459907d4f4db
parent1f8bcac09af61e58c5121aa0a932190700ad554d
parent57a33d89672d7c6b1864185652b7cae0747f8323
Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp:
  qapi: g_hash_table_find() instead of GHashTableIter.
  qmp: make block job command naming consistent