Skip to content

[master] bring in changes that went first to 18.09 branch#169

Merged
andrewhsu merged 3 commits into
docker:masterfrom
andrewhsu:sync
Aug 28, 2018
Merged

[master] bring in changes that went first to 18.09 branch#169
andrewhsu merged 3 commits into
docker:masterfrom
andrewhsu:sync

Conversation

@andrewhsu
Copy link
Copy Markdown
Contributor

@andrewhsu andrewhsu commented Aug 28, 2018

Should have gone to master branch first. This PR will now bring master branch up-to-date with 18.09 branch.

Cherry picks of 7240669 eea6967 3614f5d:

$ git cherry-pick -s -x 7240669 eea6967 3614f5d
[sync 5ad8795] Make engine scope a build time setting
 Author: Daniel Hiltgen <daniel.hiltgen@docker.com>
 Date: Fri Aug 24 09:54:19 2018 -0700
 3 files changed, 15 insertions(+), 5 deletions(-)
[sync be68a39] update containerd proxy commit to afca176
 Date: Fri Aug 24 22:14:20 2018 +0000
 1 file changed, 1 insertion(+), 1 deletion(-)
[sync e274c37] added RestartSec
 Date: Fri Aug 24 22:40:02 2018 +0000
 1 file changed, 1 insertion(+)

Went in clean.

Brings in PRs: #160 #162 #164

Daniel Hiltgen and others added 3 commits August 28, 2018 19:56
@andrewhsu
Make engine scope a build time setting
5ad8795 
This should make it easier to change downstream builds
to change the scope.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 7240669)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu
update containerd proxy commit to afca176
be68a39 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit eea6967)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu
added RestartSec
e274c37 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit 3614f5d)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu andrewhsu requested review from a team and crosbymichael August 28, 2018 19:59
crosbymichael
crosbymichael approved these changes Aug 28, 2018
View reviewed changes
Copy link
Copy Markdown
Contributor

@crosbymichael crosbymichael left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit 314513a into docker:master Aug 28, 2018
@andrewhsu andrewhsu deleted the sync branch August 28, 2018 20:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@crosbymichael crosbymichael crosbymichael approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@andrewhsu @crosbymichael