diff mbox series

[ovs-dev,branch-2.11,1/2] Set release date for 2.11.6.

Message ID 20210210151033.2954704-2-i.maximets@ovn.org
State Accepted
Headers show
Series Release patches for v2.13.3. | expand

Commit Message

Ilya Maximets Feb. 10, 2021, 3:10 p.m. UTC 
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
---
 NEWS             | 5 ++++-
 debian/changelog | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

Comments

0-day Robot Feb. 10, 2021, 8:58 p.m. UTC | #1 
Bleep bloop.  Greetings Ilya Maximets, 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:
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Set release date for 2.11.6.
When you have resolved this problem, run "git am --continue".
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 mbox series

Patch

diff --git a/NEWS b/NEWS
index 531ce37d8..3ee2f0022 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@ 
-v2.11.6 - xx xxx xxxx
+v2.11.6 - 10 Feb 2021
 ---------------------
+   - Bug fixes
+   - Security:
+     * Fixed packet parsing vulnerability CVE-2020-35498.
 
 v2.11.5 - 13 Jan 2021
 ---------------------
diff --git a/debian/changelog b/debian/changelog
index f7af0ad68..2bdd0c9d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@  openvswitch (2.11.6-1) unstable; urgency=low
    [ Open vSwitch team ]
    * New upstream version
 
- -- Open vSwitch team <dev@openvswitch.org>  Wed, 13 Jan 2021 11:26:35 -0500
+ -- Open vSwitch team <dev@openvswitch.org>  Wed, 10 Feb 2021 16:07:06 +0100
 
 openvswitch (2.11.5-1) unstable; urgency=low
    [ Open vSwitch team ]