diff mbox

trivial: Restore blank line in qapi-schema

Message ID 1476739794-19536-1-git-send-email-eblake@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Eric Blake Oct. 17, 2016, 9:29 p.m. UTC 
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(+)

Comments

Laurent Vivier Oct. 19, 2016, 12:09 p.m. UTC | #1 
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>
Markus Armbruster Oct. 21, 2016, 6:12 p.m. UTC | #2 
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!
diff mbox

Patch

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
 #