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

un-fork coreos/etcd - bump to v3.2.1 #2296

Merged
merged 1 commit into from
Jul 6, 2017

Conversation

thaJeztah
Copy link
Member

commit 5d77af7 (#2158) temporarily switch etcd to a fork, pending a pull request (etcd-io/etcd#7830) to be merged, and a new release that contains the change.

The pull request was merged, and included in etcd v3.2.0

This patch bumps etcd to v3.2.1, which contains some bug-fixes on top of v3.2.0

ping @aaronlehmann @nishanttotla ptal

commit 5d77af7
temporarily switch etcd to a fork, pending a
pull-request to be merged, and a new release
that contains the change.

The pull request was merged, and included in
etcd v3.2.0

This patch bumps etcd to v3.2.1, which contains
some bug-fixes on top of v3.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@codecov
Copy link

codecov bot commented Jul 3, 2017

Codecov Report

Merging #2296 into master will increase coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #2296      +/-   ##
==========================================
+ Coverage    61.1%   61.12%   +0.01%     
==========================================
  Files         128      128              
  Lines       20549    20549              
==========================================
+ Hits        12557    12561       +4     
- Misses       6607     6608       +1     
+ Partials     1385     1380       -5

1 similar comment
@codecov
Copy link

codecov bot commented Jul 3, 2017

Codecov Report

Merging #2296 into master will increase coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #2296      +/-   ##
==========================================
+ Coverage    61.1%   61.12%   +0.01%     
==========================================
  Files         128      128              
  Lines       20549    20549              
==========================================
+ Hits        12557    12561       +4     
- Misses       6607     6608       +1     
+ Partials     1385     1380       -5

Copy link
Contributor

@nishanttotla nishanttotla left a comment

Choose a reason for hiding this comment

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

LGTM

(let's wait for @aaronlehmann as well, we should confirm that there are no other side effects of bumping up)

@thaJeztah
Copy link
Member Author

agreed, definitely want him to have a look at this 👍

@aaronlehmann
Copy link
Collaborator

LGTM

Normally I'm somewhat apprehensive about updating this dependency, since doing so has triggered bugs in the past. But these changes look minor and sensible. I think it's reasonable to update this as long as it's not happening just before a stable release.

Could you please make a followup PR for moby/moby?

@aaronlehmann aaronlehmann merged commit 47ddecf into moby:master Jul 6, 2017
@thaJeztah thaJeztah deleted the un-fork-etcd branch July 6, 2017 20:46
andrewhsu pushed a commit to docker-archive/docker-ce that referenced this pull request Jul 14, 2017
- moby/swarmkit#2266 (support for templating Node.Hostname in docker executor)
- moby/swarmkit#2281 (change restore action on objects to be update, not delete/create)
- moby/swarmkit#2285 (extend watch queue with timeout and size limit)
- moby/swarmkit#2253 (version-aware failure tracking in the scheduler)
- moby/swarmkit#2275 (update containerd and port executor to container client library)
- moby/swarmkit#2292 (rename some generic resources)
- moby/swarmkit#2300 (limit the size of the external CA response)
- moby/swarmkit#2301 (delete global tasks when the node running them is deleted)

Minor cleanups, dependency bumps, and vendoring:
- moby/swarmkit#2271
- moby/swarmkit#2279
- moby/swarmkit#2283
- moby/swarmkit#2282
- moby/swarmkit#2274
- moby/swarmkit#2296 (dependency bump of etcd, go-winio)

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 4509a00
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/engine-extract that referenced this pull request Mar 16, 2020
- moby/swarmkit#2266 (support for templating Node.Hostname in docker executor)
- moby/swarmkit#2281 (change restore action on objects to be update, not delete/create)
- moby/swarmkit#2285 (extend watch queue with timeout and size limit)
- moby/swarmkit#2253 (version-aware failure tracking in the scheduler)
- moby/swarmkit#2275 (update containerd and port executor to container client library)
- moby/swarmkit#2292 (rename some generic resources)
- moby/swarmkit#2300 (limit the size of the external CA response)
- moby/swarmkit#2301 (delete global tasks when the node running them is deleted)

Minor cleanups, dependency bumps, and vendoring:
- moby/swarmkit#2271
- moby/swarmkit#2279
- moby/swarmkit#2283
- moby/swarmkit#2282
- moby/swarmkit#2274
- moby/swarmkit#2296 (dependency bump of etcd, go-winio)

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 4509a00
Component: engine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants