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

update with latest changes from docker-ce-packaging #41

Merged
merged 5 commits into from
Jun 6, 2017
Merged

update with latest changes from docker-ce-packaging #41

merged 5 commits into from
Jun 6, 2017

Conversation

andrewhsu
Copy link
Contributor

@andrewhsu andrewhsu commented Jun 6, 2017

andrewhsu and others added 5 commits June 6, 2017 21:20
Signed-off-by: Andrew Hsu <[email protected]>
(cherry picked from commit ade95a2)
Signed-off-by: Andrew Hsu <[email protected]>
Signed-off-by: Andrew Hsu <[email protected]>
(cherry picked from commit f6d30c3)
Signed-off-by: Andrew Hsu <[email protected]>
So we can use it at will

Signed-off-by: Eli Uriegas <[email protected]>
(cherry picked from commit 533a843)

Conflicts:
components/packaging/static/Makefile
Signed-off-by: Andrew Hsu <[email protected]>
Signed-off-by: Eli Uriegas <[email protected]>
(cherry picked from commit a1b7f6f)

Conflicts:
components/packaging/static/Makefile
Signed-off-by: Andrew Hsu <[email protected]>
Signed-off-by: Eli Uriegas <[email protected]>
(cherry picked from commit 097516f)
Signed-off-by: Andrew Hsu <[email protected]>
@andrewhsu
Copy link
Contributor Author

@seemethere @tiborvass

@seemethere
Copy link
Contributor

seemethere commented Jun 6, 2017

I'm almost done with: docker/docker-ce-packaging#13, should we wait until that to merge? @andrewhsu

@andrewhsu
Copy link
Contributor Author

This one first, to get builds going for RC2.

@andrewhsu andrewhsu merged commit de513d0 into docker-archive:17.06 Jun 6, 2017
@andrewhsu andrewhsu deleted the update-pack branch June 6, 2017 22:16
@andrewhsu andrewhsu modified the milestone: 17.06.0 Jul 12, 2017
docker-jenkins pushed a commit that referenced this pull request Sep 1, 2018
[18.09] backport "fix relabeling local volume source dir"
Upstream-commit: 648704522bdeccff09816055db754478e7b97c93
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
…lugin

Revert "Added the metrics plugin to the RPM/DEB packages"
Upstream-commit: 0f409bf
Component: packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
…lugin

Revert "Added the metrics plugin to the RPM/DEB packages"
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.

2 participants