[ovs-dev,1/2] Prepare for 20.03.0
diff mbox series

Message ID 20200204201900.1489800-1-mmichels@redhat.com
State New
Headers show
Series
  • [ovs-dev,1/2] Prepare for 20.03.0
Related show

Commit Message

Mark Michelson Feb. 4, 2020, 8:18 p.m. UTC
Signed-off-by: Mark Michelson <mmichels@redhat.com>
---
 NEWS             | 2 +-
 configure.ac     | 2 +-
 debian/changelog | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

Comments

0-day Robot Feb. 4, 2020, 8:57 p.m. UTC | #1
Bleep bloop.  Greetings Mark Michelson, 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:
fatal: sha1 information is lacking or useless (NEWS).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Prepare for 20.03.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
Numan Siddique Feb. 5, 2020, 10:51 a.m. UTC | #2
On Wed, Feb 5, 2020 at 1:49 AM Mark Michelson <mmichels@redhat.com> wrote:
>
> Signed-off-by: Mark Michelson <mmichels@redhat.com>

Acked-by: Numan Siddique <numans@ovn.org>

> ---
>  NEWS             | 2 +-
>  configure.ac     | 2 +-
>  debian/changelog | 4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/NEWS b/NEWS
> index cd93dea21..f3242a70f 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -1,4 +1,4 @@
> -Post-OVS-v2.12.0
> +OVN v20.03.0 - xx xxx xxxx
>  ---------------------
>     - OVN was split out from the OVS repository and is now released
>       independently.
> diff --git a/configure.ac b/configure.ac
> index 9b29cbfe4..2bcd1945b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -13,7 +13,7 @@
>  # limitations under the License.
>
>  AC_PREREQ(2.63)
> -AC_INIT(ovn, 2.12.90, bugs@openvswitch.org)
> +AC_INIT(ovn, 20.03.0, bugs@openvswitch.org)
>  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 eb7c7b035..04ac49b64 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,8 +1,8 @@
> -openvswitch (2.11.90-1) unstable; urgency=low
> +OVN (20.03.0-1) unstable; urgency=low
>
>     * New upstream version
>
> - -- Open vSwitch team <dev@openvswitch.org>  Sat, 20 Jan 2019 13:28:37 -0700
> + -- OVN team <dev@openvswitch.org>  Tue, 4 Feb 2020 13:40:19 -0500
>
>  openvswitch (2.11.0-1) unstable; urgency=low
>
> --
> 2.24.1
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>

Patch
diff mbox series

diff --git a/NEWS b/NEWS
index cd93dea21..f3242a70f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@ 
-Post-OVS-v2.12.0
+OVN v20.03.0 - xx xxx xxxx
 ---------------------
    - OVN was split out from the OVS repository and is now released
      independently.
diff --git a/configure.ac b/configure.ac
index 9b29cbfe4..2bcd1945b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ 
 # limitations under the License.
 
 AC_PREREQ(2.63)
-AC_INIT(ovn, 2.12.90, bugs@openvswitch.org)
+AC_INIT(ovn, 20.03.0, bugs@openvswitch.org)
 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 eb7c7b035..04ac49b64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@ 
-openvswitch (2.11.90-1) unstable; urgency=low
+OVN (20.03.0-1) unstable; urgency=low
 
    * New upstream version
 
- -- Open vSwitch team <dev@openvswitch.org>  Sat, 20 Jan 2019 13:28:37 -0700
+ -- OVN team <dev@openvswitch.org>  Tue, 4 Feb 2020 13:40:19 -0500
 
 openvswitch (2.11.0-1) unstable; urgency=low