bump nginx-module-vts from v0.1.15 to v0.2.1#2827
Merged
Conversation
zebot
added
the
ok-to-test
akshaymankar
reviewed
Nov 7, 2022
Member
akshaymankar
left a comment
akshaymankar
left a comment
There was a problem hiding this comment.
Perhaps you want to remove this from the previous changelog?
Contributor
Author
I've reused the previous changelog.d file. Since this is already in master branch a merge back to develop will then conflict with the changes from this PR. I'll resolve it then so that this changelog.d file will not get deleted so it'll end up in the next release. I manually removed the wrong changelog entry from the release notes https://github.com/wireapp/wire-server/releases/tag/v2022-11-03 |
akshaymankar
approved these changes
Nov 7, 2022
smatting
added a commit
that referenced
this pull request
Nov 8, 2022
This intentional conflict is resolved by this commit. See #2827 (comment)
This was referenced Nov 25, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR re-applies the changes from #2793
which were un-done by #2780
Checklist
changelog.d