Prepare for 3.3.0.

Also fixed the Conntrack Helper Persistence version.

Acked-by: Eelco Chaudron <echaudro@redhat.com>
Acked-by: Kevin Traynor <ktraynor@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>

Documentation/faq/releases.rst

@@ -140,7 +140,7 @@ Q: Are all features available with all datapaths?
     Conntrack Zone Limit            4.18           2.10         2.13     YES
     Conntrack NAT                   4.6            2.6          2.8      YES
     Conntrack NAT6                  4.6            2.6          2.8      3.0
-    Conntrack Helper Persist.       YES            YES          3.2      NO
+    Conntrack Helper Persist.       YES            YES          3.3      NO
     Tunnel - LISP                   NO             2.11         NO       NO
     Tunnel - STT                    NO             2.4          NO       YES
     Tunnel - GRE                    3.11           1.0          2.4      YES
@@ -220,6 +220,7 @@ Q: What DPDK version does each Open vSwitch release work with?
     3.0.x        21.11.5
     3.1.x        22.11.3
     3.2.x        22.11.3
+    3.3.x        23.11
     ============ ========
 
 Q: Are all the DPDK releases that OVS versions work with maintained?

NEWS

@@ -1,4 +1,4 @@
-Post-v3.2.0
+v3.3.0 - xx xxx xxxx
 --------------------
    - OVSDB:
      * Support pre-vote mechanism in RAFT that protects the cluster against

configure.ac

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ(2.63)
-AC_INIT(openvswitch, 3.2.90, bugs@openvswitch.org)
+AC_INIT(openvswitch, 3.3.0, bugs@openvswitch.org)
 AC_CONFIG_SRCDIR([vswitchd/ovs-vswitchd.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])

debian/changelog

@@ -1,8 +1,8 @@
-openvswitch (3.2.90-1) unstable; urgency=low
+openvswitch (3.3.0-1) unstable; urgency=low
 
    * New upstream version
 
- -- Open vSwitch team <dev@openvswitch.org>  Mon, 17 Jul 2023 14:40:01 +0100
+ -- Open vSwitch team <dev@openvswitch.org>  Wed, 17 Jan 2024 13:00:00 +0100
 
 openvswitch (3.2.0-1) unstable; urgency=low
 

debian/rules

@@ -134,8 +134,8 @@ override_dh_python3:
 # Helper target for creating snapshots from upstream git
 DATE=$(shell date +%Y%m%d)
 # Upstream branch to track
-BRANCH=branch-3.2
-VERSION=3.2.0
+BRANCH=branch-3.3
+VERSION=3.3.0
 
 get-orig-snapshot:
 	rm -Rf openvswitch-upstream