* [Qemu-trivial] [PATCH] trivial: Restore blank line in qapi-schema
@ 2016-10-17 21:29 ` Eric Blake
0 siblings, 0 replies; 6+ messages in thread
From: Eric Blake @ 2016-10-17 21:29 UTC (permalink / raw)
To: qemu-devel; +Cc: dave, quintela, qemu-trivial, Markus Armbruster
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Qemu-devel] [PATCH] trivial: Restore blank line in qapi-schema
@ 2016-10-17 21:29 ` Eric Blake
0 siblings, 0 replies; 6+ messages in thread
From: Eric Blake @ 2016-10-17 21:29 UTC (permalink / raw)
To: qemu-devel; +Cc: dave, quintela, qemu-trivial, Markus Armbruster
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Qemu-trivial] [PATCH] trivial: Restore blank line in qapi-schema
2016-10-17 21:29 ` [Qemu-devel] " Eric Blake
@ 2016-10-19 12:09 ` Laurent Vivier
-1 siblings, 0 replies; 6+ messages in thread
From: Laurent Vivier @ 2016-10-19 12:09 UTC (permalink / raw)
To: Eric Blake, qemu-devel; +Cc: qemu-trivial, dave, Markus Armbruster, quintela
On 17/10/2016 23:29, Eric Blake wrote:
> 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
> #
>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [PATCH] trivial: Restore blank line in qapi-schema
@ 2016-10-19 12:09 ` Laurent Vivier
0 siblings, 0 replies; 6+ messages in thread
From: Laurent Vivier @ 2016-10-19 12:09 UTC (permalink / raw)
To: Eric Blake, qemu-devel; +Cc: qemu-trivial, dave, Markus Armbruster, quintela
On 17/10/2016 23:29, Eric Blake wrote:
> 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
> #
>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-trivial] [Qemu-devel] [PATCH] trivial: Restore blank line in qapi-schema
2016-10-17 21:29 ` [Qemu-devel] " Eric Blake
@ 2016-10-21 18:12 ` Markus Armbruster
-1 siblings, 0 replies; 6+ messages in thread
From: Markus Armbruster @ 2016-10-21 18:12 UTC (permalink / raw)
To: Eric Blake; +Cc: qemu-devel, qemu-trivial, dave, quintela
Eric Blake <eblake@redhat.com> writes:
> 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>
Applied to qapi-next, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] trivial: Restore blank line in qapi-schema
@ 2016-10-21 18:12 ` Markus Armbruster
0 siblings, 0 replies; 6+ messages in thread
From: Markus Armbruster @ 2016-10-21 18:12 UTC (permalink / raw)
To: Eric Blake; +Cc: qemu-devel, qemu-trivial, dave, quintela
Eric Blake <eblake@redhat.com> writes:
> 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>
Applied to qapi-next, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-10-21 18:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-17 21:29 [Qemu-trivial] [PATCH] trivial: Restore blank line in qapi-schema Eric Blake
2016-10-17 21:29 ` [Qemu-devel] " Eric Blake
2016-10-19 12:09 ` [Qemu-trivial] " Laurent Vivier
2016-10-19 12:09 ` [Qemu-devel] " Laurent Vivier
2016-10-21 18:12 ` [Qemu-trivial] [Qemu-devel] " Markus Armbruster
2016-10-21 18:12 ` Markus Armbruster
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.