From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 1/7] trivial: Restore blank line in qapi-schema
Date: Tue, 25 Oct 2016 17:57:56 +0200 [thread overview]
Message-ID: <1477411082-12075-2-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1477411082-12075-1-git-send-email-armbru@redhat.com>
From: Eric Blake <eblake@redhat.com>
Commit de63ab6 accidentally undid part of commit a43edcf,
because the two patches were written in parallel, and the
blank line was not noticed as a casualty of merge conflicts.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1476739794-19536-1-git-send-email-eblake@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qapi-schema.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/qapi-schema.json b/qapi-schema.json
index 5a8ec38..d6a43a1 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -737,6 +737,7 @@
'*tls-hostname': 'str',
'*max-bandwidth': 'int',
'*downtime-limit': 'int'} }
+
##
# @query-migrate-parameters
#
--
2.5.5
next prev parent reply other threads:[~2016-10-25 15:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-25 15:57 [Qemu-devel] [PULL 0/7] QAPI patches for 2016-10-25 Markus Armbruster
2016-10-25 15:57 ` Markus Armbruster [this message]
2016-10-25 15:57 ` [Qemu-devel] [PULL 2/7] qapi: add trace events for visitor Markus Armbruster
2016-10-25 15:57 ` [Qemu-devel] [PULL 3/7] qapi: rename *qmp-*-visitor* to *qobject-*-visitor* Markus Armbruster
2016-10-25 15:57 ` [Qemu-devel] [PULL 4/7] qapi: rename QmpInputVisitor to QObjectInputVisitor Markus Armbruster
2016-10-25 15:58 ` [Qemu-devel] [PULL 5/7] qapi: rename QmpOutputVisitor to QObjectOutputVisitor Markus Armbruster
2016-10-25 15:58 ` [Qemu-devel] [PULL 6/7] qapi: don't pass two copies of TestInputVisitorData to tests Markus Armbruster
2016-10-25 15:58 ` [Qemu-devel] [PULL 7/7] qdict: implement a qdict_crumple method for un-flattening a dict Markus Armbruster
2016-10-25 17:08 ` [Qemu-devel] [PULL 0/7] QAPI patches for 2016-10-25 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477411082-12075-2-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).