Merge branch 'init_container_template' of https://github.com/DTadrzak/aic-helm into init_container_template

# Conflicts:
#	common/templates/_funcs.tpl

Signed-off-by: DTadrzak <daniel.tadrzak@intel.com>
This commit is contained in:
DTadrzak 2017-01-16 10:51:08 +01:00
commit c508a70546

View File

@ -52,4 +52,4 @@
}
]
}
{{- end -}}
{{- end -}}