Skip to content
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.

Sign up for GitHub

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

Jump to bottom

versionize the include directory in definitions.md and operations.md #16217

Merged
merged 1 commit into from
Oct 27, 2015
Merged

versionize the include directory in definitions.md and operations.md #16217

merged 1 commit into from
Oct 27, 2015

Conversation

caesarxuchao
Copy link
Member

#16213 needs this PR.

I will update the release-1.1 branch manually after #16057 is merged.

@k8s-bot
Copy link

k8s-bot commented Oct 24, 2015

GCE e2e/unit/integration build/test failed for commit 6cca6d1e115b116bfc912f222345affd618703d2.

@caesarxuchao
Copy link
Member Author

@k8s-bot test this please

@k8s-bot
Copy link

k8s-bot commented Oct 24, 2015

GCE e2e/unit/integration build/test failed for commit 6cca6d1e115b116bfc912f222345affd618703d2.

@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 24, 2015
@k8s-github-robot
Copy link

Labelling this PR as size/S

@caesarxuchao
Copy link
Member Author

Jenkins seems to be broken again:

ERROR: Error fetching remote repo 'origin'

@j3ffml
Copy link
Contributor

j3ffml commented Oct 24, 2015

Sorry about failing tests. I broke e2e job trying to add in unit/integration. Should be working now. @k8s-bot test this

@k8s-bot
Copy link

k8s-bot commented Oct 24, 2015

GCE e2e test build/test passed for commit 6cca6d1e115b116bfc912f222345affd618703d2.

@caesarxuchao caesarxuchao reopened this Oct 26, 2015
@caesarxuchao caesarxuchao assigned nikhiljindal and unassigned thockin Oct 26, 2015
nikhiljindal
nikhiljindal reviewed Oct 26, 2015
View reviewed changes
build/versionize-docs.sh
@@ -60,6 +62,9 @@ for doc in "${mdfiles[@]}"; do
# Replace /HEAD in html preview links with /NEW_VERSION.
$SED -ri -e "s|(${HTML_PREVIEW_PREFIX}/HEAD)|${HTML_PREVIEW_PREFIX}/${NEW_VERSION}|" "${doc}"

# Replace <REPLACE-WITH-RELEASE-VERSION> with NEW_VERSION
$SED -ri -e "s|${DIRCTORY_KEY_WORDS}|${NEW_VERSION}|" "${doc}"
Copy link
Contributor

Choose a reason for hiding this comment

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

Add "|g" at the end (for replace all occurrences).
I am doing that at other places in this file in my PR.

@caesarxuchao caesarxuchao force-pushed the update-versionize branch 2 times, most recently from de4595f to 413d7b5 Compare October 26, 2015 21:07
@caesarxuchao
Copy link
Member Author

@nikhiljindal Update. PTAL. Thanks.

thockin
thockin reviewed Oct 26, 2015
View reviewed changes
build/versionize-docs.sh
@@ -45,6 +48,8 @@ echo "+++ Versioning documentation and examples"

# Update the docs to match this version.
HTML_PREVIEW_PREFIX="https://htmlpreview.github.io/\?https://github.com/kubernetes/kubernetes"
# Update the include directory in definitions.md and operations.md.
DIRCTORY_KEY_WORDS="<REPLACE-WITH-RELEASE-VERSION>"
Copy link
Member

Choose a reason for hiding this comment

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

s/DIRCTORY/DIRECTORY

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed. Thanks.

@thockin thockin added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 26, 2015
@thockin
Copy link
Member

thockin commented Oct 26, 2015

LGTM, I'll go look for the gh-pages half of this now

@k8s-bot
Copy link

k8s-bot commented Oct 26, 2015

GCE e2e test build/test passed for commit 298ed10e67741bc41ddf661b02b20623dfe20457.

@caesarxuchao caesarxuchao mentioned this pull request Oct 26, 2015
Merged
@k8s-bot
Copy link

k8s-bot commented Oct 26, 2015

GCE e2e test build/test passed for commit 413d7b52d40dee9179bb6f922c8ccdcac18e90e1.

@k8s-github-robot
Copy link

PR changed after LGTM, removing LGTM.

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 26, 2015
@k8s-bot
Copy link

k8s-bot commented Oct 26, 2015

GCE e2e test build/test passed for commit 45b0917.

@caesarxuchao
Copy link
Member Author

Shippable is a flake

@caesarxuchao caesarxuchao reopened this Oct 27, 2015
@caesarxuchao caesarxuchao added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 27, 2015
@caesarxuchao
Copy link
Member Author

I'm adding back the lgtm. @nikhiljindal please remove it if you find more problems. Thanks.

@nikhiljindal
Copy link
Contributor

LGTM

@caesarxuchao
Copy link
Member Author

@k8s-oncall can I manually merge this? The merge-bot isn't picking this

lavalamp added a commit that referenced this pull request Oct 27, 2015
@lavalamp
Merge pull request #16217 from caesarxuchao/update-versionize
b791642 
versionize the include directory in definitions.md and operations.md
@lavalamp lavalamp merged commit b791642 into kubernetes:master Oct 27, 2015
k8s-github-robot referenced this pull request Oct 28, 2015
Merge pull request #16315 from caesarxuchao/automated-cherry-pick-of-…
3b33f92 
…#16217-upstream-release-1.1

Auto commit by PR queue bot
shyamjvs referenced this pull request in shyamjvs/kubernetes Dec 1, 2016
Merge pull request kubernetes#16315 from caesarxuchao/automated-cherr…
c5a6666 
…y-pick-of-#16217-upstream-release-1.1

Auto commit by PR queue bot
shouhong referenced this pull request in shouhong/kubernetes Feb 14, 2017
Merge pull request kubernetes#16315 from caesarxuchao/automated-cherr…
6e06f1f 
…y-pick-of-#16217-upstream-release-1.1

Auto commit by PR queue bot
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikhiljindal nikhiljindal

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@caesarxuchao @k8s-bot @k8s-github-robot @j3ffml @thockin @nikhiljindal @k8s-teamcity-mesosphere @lavalamp @googlebot