github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 22:53:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9769 from brendandburns/secure

Browse Source 
Revert the revert of https://github.com/GoogleCloudPlatform/kubernetes/pull/9761
This commit is contained in:
Saad Ali
2015-06-16 14:21:54 -07:00
parent 068000a8ba 2c59a3c4a4
commit 4d25121206
7 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/docker/default
View File

@@ -1,5 +1,5 @@
{% set docker_opts = "" -%}
{% if grains.docker_opts is defined -%}
{% if grains.docker_opts is defined and grains.docker_opts -%}
{% set docker_opts = grains.docker_opts -%}
{% endif -%}