diff mbox series

[ovs-dev,branch-22.03] NEWS: Fix NEWS file.

Message ID 20220922122820.669206-1-dceara@redhat.com
State Accepted
Headers show
Series [ovs-dev,branch-22.03] NEWS: Fix NEWS file. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/github-robot-_ovn-kubernetes fail github build: failed

Commit Message

Dumitru Ceara Sept. 22, 2022, 12:28 p.m. UTC
Backport e292e1376545 ("Bump required python version to 3.6.")
incorrectly changed the NEWS file.  Fix it now.

Signed-off-by: Dumitru Ceara <dceara@redhat.com>
---
 NEWS | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

Comments

Mark Michelson Sept. 22, 2022, 12:42 p.m. UTC | #1
Thanks, Dumitru.

Acked-by: Mark Michelson <mmichels@redhat.com>

I went ahead and merged this to branch-22.03

On 9/22/22 08:28, Dumitru Ceara wrote:
> Backport e292e1376545 ("Bump required python version to 3.6.")
> incorrectly changed the NEWS file.  Fix it now.
> 
> Signed-off-by: Dumitru Ceara <dceara@redhat.com>
> ---
>   NEWS | 13 +------------
>   1 file changed, 1 insertion(+), 12 deletions(-)
> 
> diff --git a/NEWS b/NEWS
> index 1d236da14..0fd255942 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -1,19 +1,8 @@
>   OVN v22.03.2 - xx xxx xxxx
>   --------------------------
> -  - Bump python version required for building OVN to 3.6.
> -
> -OVN v22.06.0 - 03 Jun 2022
> ---------------------------
> -  - Support IGMP and MLD snooping on transit logical switches that connect
> -    different OVN Interconnection availability zones.
> -  - Replaced the usage of masked ct_label by ct_mark in most cases to work
> -    better with hardware-offloading.
> -  - Support NAT for logical routers with multiple distributed gateway ports.
> -  - Add global option (NB_Global.options:default_acl_drop) to enable
> -    implicit drop behavior on logical switches with ACLs applied.
> ->>>>>>> 6cbda808a (Bump required python version to 3.6.)
>     - Support (LSP.options:qos_min_rate) to guarantee minimal bandwidth available
>       for a logical port.
> +  - Bump python version required for building OVN to 3.6.
>   
>   OVN v22.03.1 - 03 Jun 2022
>   --------------------------
diff mbox series

Patch

diff --git a/NEWS b/NEWS
index 1d236da14..0fd255942 100644
--- a/NEWS
+++ b/NEWS
@@ -1,19 +1,8 @@ 
 OVN v22.03.2 - xx xxx xxxx
 --------------------------
-  - Bump python version required for building OVN to 3.6.
-
-OVN v22.06.0 - 03 Jun 2022
---------------------------
-  - Support IGMP and MLD snooping on transit logical switches that connect
-    different OVN Interconnection availability zones.
-  - Replaced the usage of masked ct_label by ct_mark in most cases to work
-    better with hardware-offloading.
-  - Support NAT for logical routers with multiple distributed gateway ports.
-  - Add global option (NB_Global.options:default_acl_drop) to enable
-    implicit drop behavior on logical switches with ACLs applied.
->>>>>>> 6cbda808a (Bump required python version to 3.6.)
   - Support (LSP.options:qos_min_rate) to guarantee minimal bandwidth available
     for a logical port.
+  - Bump python version required for building OVN to 3.6.
 
 OVN v22.03.1 - 03 Jun 2022
 --------------------------