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

Update etcd to 2.2.1 #16694

Merged
merged 1 commit into from
Nov 5, 2015
Merged

Update etcd to 2.2.1 #16694

merged 1 commit into from
Nov 5, 2015

Conversation

jbeda
Copy link
Contributor

@jbeda jbeda commented Nov 2, 2015

This fixes #16618.

I've run the e2e tests locally and have success assuming #16676.

@k8s-github-robot
Copy link

Labelling this PR as size/M

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 2, 2015
@ixdy
Copy link
Member

ixdy commented Nov 2, 2015

Probably should update cluster/mesos/docker/test/bin/install-etcd.sh and docs/devel/development.md too.

@jbeda
Copy link
Contributor Author

jbeda commented Nov 2, 2015

I've updated cluster/mesos/docker/test/bin/install-etcd.sh but don't see anything in docs/devel/development.md that needs to be updated.

@ixdy
Copy link
Member

ixdy commented Nov 2, 2015

You're right, I forgot I also did 1c5f252 which removed the version-specific text.

@k8s-bot
Copy link

k8s-bot commented Nov 2, 2015

GCE e2e test build/test passed for commit 02d87d49dc732903916a32b177ea883ab8c0f136.

@k8s-bot
Copy link

k8s-bot commented Nov 2, 2015

GCE e2e test build/test passed for commit a7fd477af400a4967466ec44fe0a798611ca9ef2.

@mikedanese mikedanese assigned wojtek-t and unassigned thockin Nov 3, 2015
wojtek-t
wojtek-t reviewed Nov 3, 2015
View reviewed changes
cluster/images/etcd/.gitignore
etcd
etcdctl
etcd-*-linux-amd64.tar.gz
etcd-*-linux-amd64/
Copy link
Member

Choose a reason for hiding this comment

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

nit - can you please remove this funny character from the end of line?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The trailing slash? That specifies that it only matches a directory but not a file. https://git-scm.com/docs/gitignore

Copy link
Member

Choose a reason for hiding this comment

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

I think @wojtek-t was referring to the weird circle with slash that appears in GitHub's diff view. Hovering over indicates this means there's no newline at the end of this file, so maybe add one?

Copy link
Member

Choose a reason for hiding this comment

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

Yes - I meant what @ixdy wrote

@wojtek-t
Copy link
Member

wojtek-t commented Nov 3, 2015

LGTM - just one minor comment

@k8s-bot
Copy link

k8s-bot commented Nov 4, 2015

GCE e2e build/test failed for commit 993c1ee.

@jbeda
Copy link
Contributor Author

jbeda commented Nov 4, 2015

PTAL - looks like the @k8s-bot failure was due to not being able to reach docker on the build machine.

@wojtek-t
Copy link
Member

wojtek-t commented Nov 4, 2015

LGTM - thanks!

@wojtek-t wojtek-t added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 4, 2015
@ixdy
Copy link
Member

ixdy commented Nov 4, 2015

software is the worst.

@k8s-bot test this
@k8s-bot unit test this

@k8s-bot
Copy link

k8s-bot commented Nov 4, 2015

GCE e2e test build/test passed for commit 993c1ee.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Nov 5, 2015

GCE e2e build/test failed for commit 993c1ee.

@ixdy
Copy link
Member

ixdy commented Nov 5, 2015

@k8s-bot test this please

@k8s-bot
Copy link

k8s-bot commented Nov 5, 2015

GCE e2e test build/test passed for commit 993c1ee.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Nov 5, 2015

GCE e2e build/test failed for commit 993c1ee.

@piosz
Copy link
Member

piosz commented Nov 5, 2015

@k8s-bot e2e test this

@k8s-bot
Copy link

k8s-bot commented Nov 5, 2015

GCE e2e test build/test passed for commit 993c1ee.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Nov 5, 2015

GCE e2e test build/test passed for commit 993c1ee.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Nov 5, 2015
Merge pull request #16694 from jbeda/update-etcd
1831a05 
Auto commit by PR queue bot
@k8s-github-robot k8s-github-robot merged commit 1831a05 into kubernetes:master Nov 5, 2015
@jdef jdef mentioned this pull request Nov 9, 2015
Closed
@dalanlan dalanlan mentioned this pull request Nov 14, 2015
Closed
2 tasks
@jbeda jbeda deleted the update-etcd branch October 13, 2016 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@wojtek-t wojtek-t

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

Successfully merging this pull request may close these issues.

Update default etcd version
9 participants
@jbeda @k8s-github-robot @ixdy @k8s-bot @wojtek-t @piosz @k8s-teamcity-mesosphere @googlebot @thockin