| Message ID | 20200121202714.205767-1-blp@ovn.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [ovs-dev] Prepare for 2.13.0. | expand |
On Tue, 21 Jan 2020 at 12:27, Ben Pfaff <blp@ovn.org> wrote: > Signed-off-by: Ben Pfaff <blp@ovn.org> > Usually I see one more "Prepare for post-" patch. But I guess, you intend to do it later. Acked-by: Guru Shetty <guru@ovn.org> > --- > 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 xxxx > --------------------- > - 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, bugs@openvswitch.org) > +AC_INIT(openvswitch, 2.13.0, bugs@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 <dev@openvswitch.org> Mon, 22 Jul 2019 09:38:30 > -0700 > + -- Open vSwitch team <dev@openvswitch.org> 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 > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On Tue, Jan 21, 2020 at 12:42:55PM -0800, Guru Shetty wrote: > On Tue, 21 Jan 2020 at 12:27, Ben Pfaff <blp@ovn.org> wrote: > > > Signed-off-by: Ben Pfaff <blp@ovn.org> > > > > Usually I see one more "Prepare for post-" patch. But I guess, you intend > to do it later. Oh, you're right. Usually I rely on Justin to do these, but that's not going to happen anymore. I sent v2 adding the second patch.
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 aconole@redhat.com Thanks, 0-day Robot
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 xxxx --------------------- - 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, bugs@openvswitch.org) +AC_INIT(openvswitch, 2.13.0, bugs@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 <dev@openvswitch.org> Mon, 22 Jul 2019 09:38:30 -0700 + -- Open vSwitch team <dev@openvswitch.org> Tue, 21 Jan 2020 12:24:09 -0700 openvswitch (2.12.0-1) unstable; urgency=low [ Open vSwitch team ]
Signed-off-by: Ben Pfaff <blp@ovn.org> --- NEWS | 2 +- configure.ac | 2 +- debian/changelog | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)