[1.1] fix a change log error after doing a backport#4149
Closed
lifubang wants to merge 2 commits intoopencontainers:release-1.1from
Closed
[1.1] fix a change log error after doing a backport#4149lifubang wants to merge 2 commits intoopencontainers:release-1.1from
lifubang wants to merge 2 commits intoopencontainers:release-1.1from
Conversation
lifubang
force-pushed
the
fix-changelog-1.1
branch
from
ce839fa to
221c1f2
Compare
This reverts commit 87792ce. Signed-off-by: lfbzhm <lifubang@acmcoder.com>
This field reports swap-only usage. For cgroupv1, `Usage` and `Failcnt` are set by subtracting memory usage from memory+swap usage. For cgroupv2, `Usage`, `Limit`, and `MaxUsage` are set. This commit also export `MaxUsage` of memory under cgroupv2 mode, using `memory.peak` introduced in kernel 5.19. Signed-off-by: Heran Yang <heran55@126.com> (cherry picked from commit 104b8dc) Signed-off-by: lfbzhm <lifubang@acmcoder.com>
lifubang
force-pushed
the
fix-changelog-1.1
branch
from
221c1f2 to
5a492fc
Compare
Contributor
|
I think we just need to move the changelog entry from |
Member
Author
|
Although I think we should revert it and do a correct backport, but it doesn't matter, let's close this, and all tasks in 1.1.11 milestone have been resolved now(https://github.com/opencontainers/runc/milestone/27), I think we can release 1.1.11 in recent. |
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.
After a backport of #4010 in #4131, the release log of
v1.1.9had a wrong modify because of an auto merge.I think we should not modify 'CHANGELOG.md' in the common PRs(except the PR only addressing change log), but add a label
impact/changelogand add aCHANGELOG ENTRYin description of the PR.I had a comment in #4010 (review) , and then added a label
impact/changelog, but when I did review in #4010 , I ignored this change, I'm so sorry for that.