Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Conversation

@thaJeztah
Copy link
Member

backport of moby#37843 for 18.09

git checkout -b 18.09_backport_boltdb ce-engine/18.09
git cherry-pick -s -S -x 1a6e2609ead86144b75067bfe5154dad5e42d5cf
git cherry-pick -s -S -x 5c20890b9b395564e18e4f8295539bcb8bf3d0de
git cherry-pick -s -S -x 4ddebbe77f15da13f2f7736859cfc1939858d1a8

cherry-pick was clean; no conflicts

ping @mavenugo @ctelfer @jhowardmsft PTAL

John Howard added 3 commits September 14, 2018 17:33
Signed-off-by: John Howard <[email protected]>

This also adds go.etcd.io/bbolt as boltdb/bolt is no longer
maintained, and we need etcd-io/bbolt#122 which
was merged in https://github.com/etcd-io/bbolt/releases/tag/v1.3.1-etcd.8
in order to fix moby/libnetwork#1950.

Note that I can't entirely remove boltdb/bolt as it is still used by
other components. Still need to work my way through them.... These include
containerd/containerd (containerd/containerd#2634),
docker/swarmkit; moby/buildkit. And probably more....

(cherry picked from commit 1a6e260)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: John Howard <[email protected]>
(cherry picked from commit 5c20890)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: John Howard <[email protected]>
(cherry picked from commit 4ddebbe)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 18.09.0 milestone Sep 14, 2018
Copy link

@ctelfer ctelfer left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah modified the milestones: 18.09.0, 18.09.1 Nov 8, 2018
@thaJeztah thaJeztah modified the milestones: 18.09.1, 18.09.2 Jan 24, 2019
@thaJeztah thaJeztah modified the milestones: 18.09.2, 18.09.3 Feb 11, 2019
@thaJeztah
Copy link
Member Author

closing, as this was taken care of in #60

@thaJeztah thaJeztah closed this Feb 25, 2019
@thaJeztah thaJeztah deleted the 18.09_backport_boltdb branch March 24, 2022 23:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants