diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-08-03 12:21:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-08-03 12:21:57 +0100 |
| commit | 6c5dfc9ccb643a0d50fdec9f10806b14960571d1 (patch) | |
| tree | 0c646c0c7e9fcacf0a3589b6daba18ae861ded12 /qapi/error.json | |
| parent | 92a95ab44655602e8665d5a0de13e0781a4fe824 (diff) | |
| parent | f7160f32186b4ae1e1327e3bd05060fffec8f9ae (diff) | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-08-03' into staging
QAPI patches patches for 2020-08-03
# gpg: Signature made Mon 03 Aug 2020 10:08:30 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qapi-2020-08-03:
schemas: Add vim modeline
qapi: Delete unwanted indentation of top-level expressions
qapi/machine.json: Fix missing newline in doc comment
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi/error.json')
| -rw-r--r-- | qapi/error.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qapi/error.json b/qapi/error.json index 3fad08f506..94a6502de9 100644 --- a/qapi/error.json +++ b/qapi/error.json @@ -1,4 +1,5 @@ # -*- Mode: Python -*- +# vim: filetype=python ## # = QMP errors |