| commit | 2ad728bd4bf26d8144190ca87d5d36d5f33cfae9 | |
| author | Anthony Liguori <aliguori@us.ibm.com> | |
| Fri, 3 Aug 2012 19:28:26 +0000 (3 14:28 -0500) | ||
| committer | Anthony Liguori <aliguori@us.ibm.com> | |
| Fri, 3 Aug 2012 19:28:26 +0000 (3 14:28 -0500) | ||
| tree | 2a01d7c0e541d92d742fc1f932fb6ff6aa65f929 | treesnapshot (tar.gz zip) |
| parent | 9c936c8667f15cf729ee602ae2a800658580fe47 | commitdiff |
| parent | 75115d9569164b99a52847450d5133af62f3d370 | commitdiff |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp:
hmp: show the backing file depth
block: Use bdrv_get_backing_file_depth()
block: create bdrv_get_backing_file_depth()
qapi: qapi.py: allow the "'" character to be escaped
* qmp/queue/qmp:
hmp: show the backing file depth
block: Use bdrv_get_backing_file_depth()
block: create bdrv_get_backing_file_depth()
qapi: qapi.py: allow the "'" character to be escaped
| qapi-schema.json | diff1 | diff2 | blobhistory |