Skip to content

vendor: docker/swarmkit 293aa2e66279a930999044cbf6d0e590baac16ff#41282

Merged
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:bump_swarmkit2
Jul 28, 2020
Merged

vendor: docker/swarmkit 293aa2e66279a930999044cbf6d0e590baac16ff#41282
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:bump_swarmkit2

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 28, 2020

full diff: moby/swarmkit@035d564...293aa2e

  • Fix bad comment on capability_drop field in protobuf def

@thaJeztah
vendor: docker/swarmkit 293aa2e
36b1920 
full diff: moby/swarmkit@035d564...293aa2e

- Fix bad comment on capability_drop field in protobuf def

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 20.03.0 milestone Jul 28, 2020
@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 28, 2020

ping @cpuguy83 @dperny @tiborvass PTAL

cpuguy83
cpuguy83 approved these changes Jul 28, 2020
View reviewed changes
Copy link
Member

@cpuguy83 cpuguy83 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
Copy link
Member Author

thaJeztah commented Jul 28, 2020

Why is it failing on this? 😞


[2020-07-28T19:45:42.003Z] The result of vndr differs
[2020-07-28T19:45:42.003Z] 
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/LICENSE
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/NOTICE
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/README.md
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/activation/files.go
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/activation/listeners.go
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/activation/packetconns.go
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/daemon/sdnotify.go
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/daemon/watchdog.go
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/dbus/dbus.go
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/dbus/methods.go
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/dbus/properties.go
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/dbus/set.go
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/dbus/subscription.go
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/dbus/subscription_set.go
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/go.mod
[2020-07-28T19:45:42.003Z]  D vendor/github.com/coreos/go-systemd/v22/journal/journal.go

@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 28, 2020

Looks related to LK4D4/vndr#91, but we accommodated for that locally 🤔

@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 28, 2020

Kicked CI to see if it was just a glitch

@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 28, 2020

All green now, except for building the e2e image, which is unrelated

@thaJeztah thaJeztah merged commit 516d971 into moby:master Jul 28, 2020
@thaJeztah thaJeztah deleted the bump_swarmkit2 branch July 28, 2020 20:56
@thaJeztah thaJeztah mentioned this pull request Jul 28, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@tiborvass tiborvass tiborvass approved these changes

Assignees

No one assigned

Labels

area/swarm status/4-merge

Projects

None yet

Milestone

20.10.0

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @cpuguy83 @tiborvass