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

[17.06] Do not error on relabel when relabel not supported #92

Merged
merged 2 commits into from Jul 12, 2017

Conversation

Projects
None yet
3 participants
@andrewhsu
Collaborator

andrewhsu commented Jul 4, 2017

Backport fix:

With cherry-pick moby/moby@ebfdfc5:

$ git cherry-pick -s -x -Xsubtree=components/engine ebfdfc5
$ git cherry-pick -s -x -Xsubtree=components/cli/vendor/github.com/docker/docker ebfdfc5

No conflicts.

@cpuguy83

LGTM

cpuguy83 added some commits Jun 26, 2017

Do not error on relabel when relabel not supported
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit ebfdfc5)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Do not error on relabel when relabel not supported
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit ebfdfc5)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

@andrewhsu andrewhsu merged commit abfc72a into docker:17.06 Jul 12, 2017

3 checks passed

ce-tests Jenkins build docker-ce-17.06-pr 170 has succeeded
Details
ce-tests-WoW-RS1 Jenkins build docker-ce-17.06-pr-WoW-RS1 161 has succeeded
Details
dco-signed All commits are signed

@andrewhsu andrewhsu deleted the andrewhsu:fix-relabel branch Jul 12, 2017

@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017

docker-jenkins pushed a commit that referenced this pull request Mar 17, 2018

Merge pull request #92 from seemethere/refactor_epoch
Refactor epoch to be a passable variable for debian packaging
Upstream-commit: c9e56d1cf88bac85b289f364b7fc2e38d9340b96
Component: packaging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment