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

Vendor SwarmKit for 1.12.2 #26765

Merged
merged 1 commit into from
Sep 26, 2016
Merged

Vendor SwarmKit for 1.12.2 #26765

merged 1 commit into from
Sep 26, 2016

Conversation

aaronlehmann
Copy link
Contributor

@aaronlehmann aaronlehmann commented Sep 21, 2016

This brings in the following fixes:

@vieux

@thaJeztah
Copy link
Member

Looks like this is related to / fixes:

@aaronlehmann can you check if those are resolved by this? Also (as I see they're still open); do we need a separate PR to fix this in master?

@cpuguy83
Copy link
Member

These commits do not have a proper 'Signed-off-by:' marker:
11:42:55  - 2680f725fda8b7253f2a44637527019ea14bfba7

@thaJeztah
Copy link
Member

@cpuguy83 that's my fault 😞 #26707 (comment). And, apparently the DCO check does a diff compared to "master", and checks every commit since (not just the commits in the PR)

@aaronlehmann
Copy link
Contributor Author

Should we rewrite history on the 1.12.x branch? Or add a commit that disables this check?

@aaronlehmann
Copy link
Contributor Author

#26038

Let's keep this open until we confirm that the fixes here help.

#24315

Already closed (is that correct? milestone is 1.12.2 and the docker PR hasn't been backported yet)

#26617

Will close after this is merged.

Also (as I see they're still open); do we need a separate PR to fix this in master?

No, #26538 just vendored swarmkit.

@thaJeztah
Copy link
Member

Should we rewrite history on the 1.12.x branch? Or add a commit that disables this check?

Just discussed with @icecrime and that's probably the best option; I'll have a look later tonight, and will let you know when to rebase/update your PR.

@thaJeztah
Copy link
Member

@aaronlehmann should be fixed now #26707 (comment)

@aaronlehmann
Copy link
Contributor Author

Rebased.

Copy link
Contributor

@vieux vieux 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

"lgtm", but ping @LK4D4 to double check if all required fixes from SwarmKit are here

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
@aaronlehmann
Copy link
Contributor Author

I've updated this to include two more swarmkit PRs:

@LK4D4
Copy link
Contributor

LK4D4 commented Sep 23, 2016

LGTM

1 similar comment
@mrjana
Copy link
Contributor

mrjana commented Sep 23, 2016

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants