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

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

Merged
andrewhsu merged 2 commits into
docker-archive:17.06from
andrewhsu:fix-relabel
Jul 12, 2017
Merged

[17.06] Do not error on relabel when relabel not supported#92
andrewhsu merged 2 commits into
docker-archive:17.06from
andrewhsu:fix-relabel

Conversation

@andrewhsu

@andrewhsu andrewhsu commented Jul 4, 2017

Copy link
Copy Markdown
Contributor

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.

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

ping @cpuguy83 @tiborvass

@cpuguy83 cpuguy83 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

cpuguy83 added 2 commits July 12, 2017 01:16
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit ebfdfc5)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
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-archive:17.06 Jul 12, 2017
@andrewhsu andrewhsu deleted the fix-relabel branch July 12, 2017 04:29
@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017
docker-jenkins pushed a commit that referenced this pull request Mar 17, 2018
Refactor epoch to be a passable variable for debian packaging
Upstream-commit: c9e56d1
Component: packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 29, 2020
[17.06] Do not error on relabel when relabel not supported
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
Refactor epoch to be a passable variable for debian packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
[17.06] Do not error on relabel when relabel not supported
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.

3 participants