Skip to content

tidb-in-kubernetes: fix an alias#2433

Merged
TomShawn merged 1 commit into
pingcap:masterfrom
TomShawn:fix-alias-k8s
Mar 11, 2020
Merged

tidb-in-kubernetes: fix an alias#2433
TomShawn merged 1 commit into
pingcap:masterfrom
TomShawn:fix-alias-k8s

Conversation

@TomShawn
Copy link
Copy Markdown
Contributor

@TomShawn TomShawn commented Mar 11, 2020

What is changed, added or deleted? (Required)

Fix an alias in the k8s backup and restore document.

Which TiDB version(s) do your changes apply to? (Required)

  • master (the latest development version, including v4.0 changes for now)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

If you select two or more versions from above, to trigger the bot to cherry-pick this PR to your desired release version branch(es), you must add corresponding labels such as needs-cherry-pick-3.1, needs-cherry-pick-3.0, and needs-cherry-pick-2.1.

What is the related PR or file link(s)?

  • This PR is translated from:
  • Other reference link(s):

@TomShawn TomShawn added size/small Changes of a small size. needs-cherry-pick-3.1 type/bugfix This PR fixes a bug. labels Mar 11, 2020
@TomShawn TomShawn requested a review from toutdesuite March 11, 2020 09:28
@TomShawn TomShawn self-assigned this Mar 11, 2020
@TomShawn TomShawn added the translation/doing This PR’s assignee is translating this PR. label Mar 11, 2020
Copy link
Copy Markdown
Contributor

@toutdesuite toutdesuite left a comment

Choose a reason for hiding this comment

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

LGTM

@TomShawn TomShawn merged commit 8bbc321 into pingcap:master Mar 11, 2020
sre-bot pushed a commit to sre-bot/docs-cn that referenced this pull request Mar 11, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented Mar 11, 2020

cherry pick to release-3.0 in PR #2434

sre-bot pushed a commit to sre-bot/docs-cn that referenced this pull request Mar 11, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented Mar 11, 2020

cherry pick to release-3.1 in PR #2435

@TomShawn TomShawn deleted the fix-alias-k8s branch March 11, 2020 09:38
TomShawn added a commit that referenced this pull request Mar 11, 2020
* cherry pick #2433 to release-3.0

Signed-off-by: sre-bot <sre-bot@pingcap.com>

* resolve conflict

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: TomShawn <1135243111@qq.com>
TomShawn added a commit that referenced this pull request Mar 11, 2020
* cherry pick #2433 to release-3.1

Signed-off-by: sre-bot <sre-bot@pingcap.com>

* resolve conflict

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: TomShawn <1135243111@qq.com>
@TomShawn TomShawn added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Mar 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/small Changes of a small size. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. type/bugfix This PR fixes a bug.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants