summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-08-22 13:33:15 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-08-22 13:33:15 -0500
commit86759aa89d1307d0dda2435cc25943bcd7026686 (patch)
tree364644e9ddb68e73f3ce4eda3a9e56f591cb10e6 /VERSION
parentb100fcfe4966aa41d4d6908d0c4c510bcf8f82dd (diff)
parent7aa939af39e20eeca98fced59708a87c64267f54 (diff)
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp: migration: move total_time from ram stats to migration info monitor: avoid declaring unused variables qapi: Fix memory leak
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions