diff mbox series

[ovs-dev,branch-2.6,1/2] Set release date for 2.6.9.

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

Commit Message

Ilya Maximets Jan. 13, 2021, 4:48 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 Jan. 13, 2021, 7:04 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.6.9.
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 a2393a14d..a3ebbb44b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@ 
-v2.6.9 - xx xxx xxxx
+v2.6.9 - 13 Jan 2021
 --------------------
+   - Bug fixes
+   - LLDP:
+     * Security fixes for CVE-2015-8011 and CVE-2020-27827.
    - OVSDB:
      * Fixed SHA-1 hash computation for databases larger than 512 MB.
 
diff --git a/debian/changelog b/debian/changelog
index 188362666..f4abe4ce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@  openvswitch (2.6.9-1) unstable; urgency=low
    [ Open vSwitch team ]
    * New upstream version
 
- -- Open vSwitch team <dev@openvswitch.org>  Thu, 30 Jul 2020 00:25:10 +0200
+ -- Open vSwitch team <dev@openvswitch.org>  Wed, 13 Jan 2021 11:26:31 -0500
 
 openvswitch (2.6.8-1) unstable; urgency=low
    [ Open vSwitch team ]