Skip to content
This repository has been 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
merged 2 commits into from
Jul 12, 2017
Merged

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

merged 2 commits into from
Jul 12, 2017

Conversation

andrewhsu
Copy link
Contributor

@andrewhsu andrewhsu commented Jul 4, 2017 •
edited
Loading

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 approved these changes Jul 4, 2017
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

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 approved these changes Jul 4, 2017
View reviewed changes
Copy link
Contributor

@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

@cpuguy83 @andrewhsu
Do not error on relabel when relabel not supported
b0efd8d 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit ebfdfc5)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@cpuguy83 @andrewhsu
Do not error on relabel when relabel not supported
4ff004b 
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
@seemethere
Merge pull request #92 from seemethere/refactor_epoch
903f634 
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
@andrewhsu
Merge pull request docker-archive#92 from andrewhsu/fix-relabel
faf1fcb 
[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
@seemethere
Merge pull request docker-archive#92 from seemethere/refactor_epoch
c9e56d1 
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
@andrewhsu
Merge pull request docker-archive#92 from andrewhsu/fix-relabel
26507ce 
[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.
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@cpuguy83 cpuguy83 cpuguy83 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
17.06.1
Development

Successfully merging this pull request may close these issues.
3 participants
@andrewhsu @cpuguy83 @thaJeztah