summaryrefslogtreecommitdiffstats
path: root/deploy/templates/templater
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-08-11 08:37:42 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-11 08:37:42 +0000
commit91c1fe20f85a09d40e095ae7feaae872eb25b0fa (patch)
treeafca8bd0c6a4d39db0fe04ea1ccdaa068ccaab97 /deploy/templates/templater
parentf96b162d0b7ab0839a5961a23f5f57cf320168e4 (diff)
parentfd4977664a2ab2e4be5745fbaf3e3c9f9dca6796 (diff)
Merge "Fix merge_dicts logic for the case of two nonempty lists"
Diffstat (limited to 'deploy/templates/templater')
0 files changed, 0 insertions, 0 deletions