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

Automated cherry pick of #42506 #42622

Merged
merged 1 commit into from
Mar 13, 2017
Merged

Automated cherry pick of #42506 #42622

merged 1 commit into from
Mar 13, 2017

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Mar 7, 2017 •
edited
Loading

Cherry pick of #42506 on release-1.5.

#42506: Preserve custom etcd prefix compatibility for etcd3

restored normalization of custom `--etcd-prefix` when `--storage-backend` is set to etcd3

@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot
Copy link

The 'parent' PR of a cherry-pick PR must have one of the "release-note" or "release-note-action-required" labels, or this PR must follow the standard/parent release note labeling requirement. (release-note-experimental must be explicit for cherry-picks)

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Mar 7, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 7, 2017
@liggitt liggitt assigned hongchaodeng, saad-ali and mwielgus and unassigned lavalamp Mar 7, 2017
@liggitt liggitt added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Mar 7, 2017
@liggitt liggitt added this to the v1.5 milestone Mar 7, 2017
@liggitt
Copy link
Member Author

liggitt commented Mar 8, 2017

@hongchaodeng PTAL

@hongchaodeng
Copy link
Contributor

@liggitt @saad-ali
Is there any criteria for cherry-pick?

@mwielgus
Copy link
Contributor

mwielgus commented Mar 8, 2017

@liggitt Please fix release-notes

@liggitt
Copy link
Member Author

liggitt commented Mar 8, 2017

@mwielgus I fixed the release note already

@hongchaodeng
Copy link
Contributor

@mwielgus Can you make a call for this to be cherry-picked ?

@liggitt
Copy link
Member Author

liggitt commented Mar 8, 2017 •
edited
Loading

if we support etcd3 in 1.5, we need to pick this. see #42505 for details

@hongchaodeng
Copy link
Contributor

The change and release note LGTM.
No response from @mwielgus so far. I am gonna move forward this. Low risk and it's also fixing compatibility issues.

@hongchaodeng
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 9, 2017
@dchen1107
Copy link
Member

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: dchen1107, hongchaodeng, liggitt

Needs approval from an approver in each of these OWNERS Files:

We suggest the following people:
cc
You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 9, 2017
@liggitt
Copy link
Member Author

liggitt commented Mar 11, 2017

@saad-ali @mwielgus need cherry pick approval and removal of do-not-merge from you

@mwielgus mwielgus added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate labels Mar 12, 2017
@mwielgus mwielgus removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Mar 12, 2017
@mwielgus
Copy link
Contributor

Done, all labels applied. Sorry for the delay - i was flying to/attending a conference.

@k8s-github-robot k8s-github-robot merged commit d5eff13 into kubernetes:release-1.5 Mar 13, 2017
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.5" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

mintzhao pushed a commit to mintzhao/kubernetes that referenced this pull request Jun 1, 2017
Merge pull request kubernetes#42622 from liggitt/automated-cherry-pic…
17b50e3 
…k-of-#42506-upstream-release-1.5

Automatic merge from submit-queue

Automated cherry pick of kubernetes#42506

Cherry pick of kubernetes#42506 on release-1.5.

kubernetes#42506: Preserve custom etcd prefix compatibility for etcd3

```release-note
restored normalization of custom `--etcd-prefix` when `--storage-backend` is set to etcd3
```
@liggitt liggitt deleted the automated-cherry-pick-of-#42506-upstream-release-1.5 branch April 22, 2019 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@hongchaodeng hongchaodeng

@saad-ali saad-ali

@mwielgus mwielgus

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.
10 participants
@liggitt @k8s-reviewable @k8s-github-robot @hongchaodeng @mwielgus @dchen1107 @k8s-cherrypick-bot @lavalamp @saad-ali @k8s-ci-robot