Skip to content

v1.6 backports 2020-09-22 #13250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2020
Merged

v1.6 backports 2020-09-22 #13250

merged 1 commit into from
Sep 23, 2020

Conversation

vadorovsky
Copy link
Member

Once this PR is merged, you can update the PR labels via:

$ for pr in 13044; do contrib/backporting/set-labels.py $pr done 1.6; done

@vadorovsky vadorovsky requested a review from a team as a code owner September 22, 2020 15:32
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.6 kind/backports This PR provides functionality previously merged into master. labels Sep 22, 2020
@vadorovsky
Copy link
Member Author

vadorovsky commented Sep 22, 2020

This PR has changes only in docs and contrib dir, so I guess that we don't have to run the whole test suite.

@qmonnet qmonnet added the area/documentation Impacts the documentation, including textual changes, sphinx, or other doc generation code. label Sep 22, 2020
@qmonnet
Copy link
Member

qmonnet commented Sep 22, 2020

test-docs-please

Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still have a test to build the doc in v1.6 so I ran it.

Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW I think it's also fine to just drop the issue template / docs changes changes to simplify the backport. My aim in making it available for backport is mainly to make the scripts available for anyone preparing a release on older branches. They should be able to refer to the latest version of the docs but change the local git branch to an older branch and use the scripts.

[ upstream commit 5388518 ]

Signed-off-by: Joe Stringer <joe@cilium.io>
Signed-off-by: Michal Rostecki <mrostecki@opensuse.org>
@vadorovsky vadorovsky force-pushed the pr/v1.6-backport-2020-09-22 branch from 629fd04 to 0cdb949 Compare September 23, 2020 12:55
@qmonnet
Copy link
Member

qmonnet commented Sep 23, 2020

test-docs-please

@qmonnet qmonnet merged commit ceb6a57 into v1.6 Sep 23, 2020
@qmonnet qmonnet deleted the pr/v1.6-backport-2020-09-22 branch September 23, 2020 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/documentation Impacts the documentation, including textual changes, sphinx, or other doc generation code. kind/backports This PR provides functionality previously merged into master.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants