scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-12-16 21:07:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30845 from YuPengZTE/master

Browse Source 
Automatic merge from submit-queue

The first letter should be capitalized
This commit is contained in:
Kubernetes Submit Queue
2016-09-10 00:22:10 -07:00
committed by GitHub
parent 0764aa0b68 3faa38fcb6
commit 43710a8714
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/docker/init.sls
View File

@@ -471,7 +471,7 @@ docker:
# is managing Docker restart we should probably just delete this whole thing
# but the kubernetes components use salt 'require' to set up a dag, and that
# complicated and scary to unwind.
# On AWS, we use a trick now... we don't start the docker service through Salt.
# On AWS, we use a trick now... We don't start the docker service through Salt.
# Kubelet or our health checker will start it. But we use service.enabled,
# so we still have a `service: docker` node for our DAG.
{% if grains.cloud is defined and grains.cloud == 'aws' %}