scottk/openstack-helm
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/openstack-helm.git synced 2025-12-26 17:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
parent 71427ce905 f883f97421
commit c508a70546
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/templates/_funcs.tpl
View File

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