Message ID | 20230817132505.4022046-2-i.maximets@ovn.org |
---|---|
State | Accepted |
Commit | f8d24583ed53d54ddb78c90d5b53103132447b98 |
Headers | show |
Series | Release patches for v3.2.0. | expand |
Context | Check | Description |
---|---|---|
ovsrobot/apply-robot | fail | apply and check: fail |
ovsrobot/intel-ovs-compilation | success | test: success |
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=diff' to see the failed patch Patch failed at 0001 Set release date for 3.2.0. 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". Patch skipped due to previous failure. Please check this out. If you feel there has been an error, please email aconole@redhat.com Thanks, 0-day Robot
On 8/17/23 15:36, 0-day Robot wrote: > 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=diff' to see the failed patch > Patch failed at 0001 Set release date for 3.2.0. > 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". > Looks like the bot tried applying to a wrong branch. Best regards, Ilya Maximets. > > Patch skipped due to previous failure. > > 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 1438f9f8d..a3a5c2e4a 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -v3.2.0 - xx xxx xxxx +v3.2.0 - 17 Aug 2023 -------------------- - OVSDB: * Changed format in which ovsdb schema conversion operations are stored in diff --git a/debian/changelog b/debian/changelog index 294b4a5db..8757e5cb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ openvswitch (3.2.0-1) unstable; urgency=low * New upstream version - -- Open vSwitch team <dev@openvswitch.org> Mon, 17 Jul 2023 14:40:00 +0100 + -- Open vSwitch team <dev@openvswitch.org> Thu, 17 Aug 2023 15:20:36 +0200 openvswitch (3.1.0-1) unstable; urgency=low
Signed-off-by: Ilya Maximets <i.maximets@ovn.org> --- NEWS | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)