From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: dave@natulte.net, quintela@redhat.com, qemu-trivial@nongnu.org,
Markus Armbruster <armbru@redhat.com>
Subject: [Qemu-trivial] [PATCH] trivial: Restore blank line in qapi-schema
Date: Mon, 17 Oct 2016 16:29:54 -0500 [thread overview]
Message-ID: <1476739794-19536-1-git-send-email-eblake@redhat.com> (raw)
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>
---
qapi-schema.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/qapi-schema.json b/qapi-schema.json
index ded1179..6da520c 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.7.4
next reply other threads:[~2016-10-17 21:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-17 21:29 Eric Blake [this message]
2016-10-19 12:09 ` [Qemu-trivial] [PATCH] trivial: Restore blank line in qapi-schema Laurent Vivier
2016-10-21 18:12 ` [Qemu-trivial] [Qemu-devel] " Markus Armbruster
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=1476739794-19536-1-git-send-email-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=armbru@redhat.com \
--cc=dave@natulte.net \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=quintela@redhat.com \
/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).