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.

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

Fix etcd3 suite #32477

Merged
merged 1 commit into from
Sep 12, 2016
Merged

Conversation

wojtek-t
Copy link
Member

@wojtek-t wojtek-t commented Sep 12, 2016

etcd3: fix suite

This change is Reviewable

@wojtek-t wojtek-t added retest-not-required release-note-none Denotes a PR that doesn't merit a release note. labels Sep 12, 2016
@gmarek gmarek added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 12, 2016
@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 12, 2016
@xiang90
Copy link
Contributor

xiang90 commented Sep 12, 2016

lgtm

@k8s-bot
Copy link

k8s-bot commented Sep 12, 2016

GCE e2e build/test passed for commit 7a9802d.

@wojtek-t
Copy link
Member Author

@k8s-bot gke test this, issue: #IGNORE (jenkins issue)

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit a062d9f into kubernetes:master Sep 12, 2016
@wojtek-t wojtek-t deleted the fix_etcd3_suite branch September 16, 2016 13:21
@wojtek-t wojtek-t added this to the v1.4 milestone Oct 20, 2016
@jessfraz jessfraz added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Oct 20, 2016
k8s-github-robot pushed a commit that referenced this pull request Oct 21, 2016
#31704-#32831-#32907-#33003-#33349-#31190-#33581-#34089-#34234-#32822-#33393-#34246-#34435-#32477-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of #31189 #31704 #32831 #32907 #33003 #33349 #31190 #33581 #34089 #34234 #32822 #33393 #34246 #34435 #32477 upstream release 1.4

We are going to release etcd v3 in 1.4.x release.

```
Cherrypick etcd v3-related bug fixes to 1.4 branch
```

Those PRs include:
- Updates of etcd Godeps
- Update to pkg/storage/etcd directory
- Two PR that were unnecessary to avoid conflicts: #31189 #31704

Automated cherry pick of #31189 #31704 #32831 #32907 #33003 #33349 #31190 #33581 #34089 #34234 #32822 #33393 #34246 #34435 #32477

@hongchaodeng @xiang90 @lavalamp @smarterclayton
@k8s-cherrypick-bot
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants