diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-12-21 13:14:06 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-12-21 13:14:06 +0000 |
commit | c3e7267935f27fe5570faffd1483b33be3258653 (patch) | |
tree | f38b876b0b160afdc63756c3e7675e2e728ad0fd /qapi-schema.json | |
parent | 4da5c51cac8363f86ec92dc99c38f9382d617647 (diff) | |
parent | bfab1aede07f864b8fbd749c3a0545b949b4cc84 (diff) |
Merge remote-tracking branch 'remotes/famz/tags/staging-pull-request' into staging
# gpg: Signature made Thu 21 Dec 2017 01:51:20 GMT
# gpg: using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6
* remotes/famz/tags/staging-pull-request:
util: add is_equal to UUID API
Revert "docker: Enable features explicitly in test-full"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi-schema.json')
0 files changed, 0 insertions, 0 deletions