Re: [ovs-dev] [PATCH v2 1/2] Prepare for 2.13.0.

2020-01-21 Thread 0-day Robot
Bleep bloop.  Greetings Ben Pfaff, I am a robot and I have tried out your patch.
Thanks for your contribution.

I encountered some error that I wasn't expecting.  See the details below.


git-am:
Failed to merge in the changes.
Patch failed at 0001 Prepare for 2.13.0.
The copy of the patch that failed is found in:
   
/var/lib/jenkins/jobs/upstream_build_from_pw/workspace/.git/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


Please check this out.  If you feel there has been an error, please email 
acon...@redhat.com

Thanks,
0-day Robot
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev


[ovs-dev] [PATCH v2 1/2] Prepare for 2.13.0.

2020-01-21 Thread Ben Pfaff
Signed-off-by: Ben Pfaff 
---
 NEWS | 2 +-
 configure.ac | 2 +-
 debian/changelog | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index c6d3b6053f8d..89b53bfae039 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Post-v2.12.0
+v2.13.0 - xx xxx 
 -
- OVN:
  * OVN has been removed from this repository. It now exists as a
diff --git a/configure.ac b/configure.ac
index 4f483fa6e3c3..92b52f67127e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 AC_PREREQ(2.63)
-AC_INIT(openvswitch, 2.12.90, b...@openvswitch.org)
+AC_INIT(openvswitch, 2.13.0, b...@openvswitch.org)
 AC_CONFIG_SRCDIR([datapath/datapath.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/debian/changelog b/debian/changelog
index 9042657ef717..c6db87d542d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-openvswitch (2.12.90-1) unstable; urgency=low
+openvswitch (2.13.0-1) unstable; urgency=low
 
* New upstream version
 
- -- Open vSwitch team   Mon, 22 Jul 2019 09:38:30 -0700
+ -- Open vSwitch team   Tue, 21 Jan 2020 12:24:09 -0700
 
 openvswitch (2.12.0-1) unstable; urgency=low
[ Open vSwitch team ]
-- 
2.23.0

___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev