[libvirt] [PATCH 1/2] news: Add <change> lost in merge

John Ferlan posted 2 patches 8 years, 10 months ago
[libvirt] [PATCH 1/2] news: Add <change> lost in merge
Posted by John Ferlan 8 years, 10 months ago
Ensure to insert </change> <change> between items - lost during merge
resolution.

Signed-off-by: John Ferlan <jferlan@redhat.com>
---
 docs/news.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/news.xml b/docs/news.xml
index 814bd93..3877984 100644
--- a/docs/news.xml
+++ b/docs/news.xml
@@ -51,6 +51,8 @@
           enhanced check may also be requested when starting a new domain to
           ensure the virtual CPU exactly matches the one specified in the XML.
         </description>
+      </change>
+      <change>
         <summary>
           qemu: Add support to migrate using TLS
         </summary>
-- 
2.9.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 1/2] news: Add <change> lost in merge
Posted by Laine Stump 8 years, 10 months ago
On 03/27/2017 11:29 AM, John Ferlan wrote:
> Ensure to insert </change> <change> between items - lost during merge
> resolution.
> 
> Signed-off-by: John Ferlan <jferlan@redhat.com>
> ---
>  docs/news.xml | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/docs/news.xml b/docs/news.xml
> index 814bd93..3877984 100644
> --- a/docs/news.xml
> +++ b/docs/news.xml
> @@ -51,6 +51,8 @@
>            enhanced check may also be requested when starting a new domain to
>            ensure the virtual CPU exactly matches the one specified in the XML.
>          </description>
> +      </change>
> +      <change>
>          <summary>
>            qemu: Add support to migrate using TLS
>          </summary>
> 

ACK.

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list