On Thu, Dec 10, 2020 at 6:43 PM Mark Michelson <[email protected]> wrote:
>
> There are a couple of small problems below. If you can fix them, then
>
> Acked-by: Mark Michelson <[email protected]>
>
> This preparation patch was supposed to go in before branch creation so
> that the branch would refer to the proper OVN version. I made the
> mistake of creating the branch without this patch in. So I think the
> proper thing to do is to merge this patch only into branch-20.12 and not
> into master.
>
> Then patch 2 should go in master only.
Thanks for the review and pointing out the typo.
I fixed the below errors you pointed out and this is what I did:
1. I applied this patch to master.
2. Since we created the branch-20.12 and missed out on this patch,
I just deleted the branch-20.12 and recreated again after this commit.
After you created the (old) branch-20.12, we haven't applied any
new features to master. There were
few bug fixes which were also backported to (old) branch-20.12. So
I thought of deleting and recreating
again.
3. And then I applied the post-v20.12 patch 2 to master.
Thanks for the reviews.
Numan
>
> On 12/7/20 9:37 AM, [email protected] wrote:
> > From: Numan Siddique <[email protected]>
> >
> > Signed-off-by: Numan Siddique <[email protected]>
> > ---
> > NEWS | 4 ++--
> > configure.ac | 2 +-
> > debian/changelog | 4 ++--
> > 3 files changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/NEWS b/NEWS
> > index 08639401f8..2800de2f3c 100644
> > --- a/NEWS
> > +++ b/NEWS
> > @@ -1,5 +1,5 @@
> > -Post-v20.09.0
> > ----------------------
> > +OVN v20.12.0 - xx xxx xxxx
> > +--------------------------
> > - The "datapath" argument to ovn-trace is now optional, since the
> > datapath can be inferred from the inport (which is required).
> > - The obsolete "redirect-chassis" way to configure gateways has been
> > diff --git a/configure.ac b/configure.ac
> > index 0b17f05b9c..b660ecaf6a 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -13,7 +13,7 @@
> > # limitations under the License.
> >
> > AC_PREREQ(2.63)
> > -AC_INIT(ovn, 20.09.90, [email protected])
> > +AC_INIT(ovn, 20.09.0, [email protected])
>
> s/20.09.0/20.12.0/
>
> > AC_CONFIG_MACRO_DIR([m4])
> > AC_CONFIG_AUX_DIR([build-aux])
> > AC_CONFIG_HEADERS([config.h])
> > diff --git a/debian/changelog b/debian/changelog
> > index c337e7c6af..a98fd85cc8 100644
> > --- a/debian/changelog
> > +++ b/debian/changelog
> > @@ -1,8 +1,8 @@
> > -ovn (20.09.90-1) unstable; urgency=low
> > +ovn (20.09.0-1) unstable; urgency=low
>
> s/20.09.0-1/20.12.0-1/
>
> >
> > * New upstream version
> >
> > - -- OVN team <[email protected]> Mon, 28 Sep 2020 10:56:26 -0400
> > + -- OVN team <[email protected]> Mon, 07 Dec 2020 19:22:36 +0530
> >
> > ovn (20.09.0-1) unstable; urgency=low
> >
> >
>
> _______________________________________________
> dev mailing list
> [email protected]
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
