Code Review / armband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: c32f2db)
Updated armband
authorMichal Skalski <mskalski@mirantis.com>
Thu, 11 Aug 2016 08:37:42 +0000 (08:37 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 11 Aug 2016 08:37:42 +0000 (08:37 +0000)
Project: fuel  91c1fe20f85a09d40e095ae7feaae872eb25b0fa

Fix merge_dicts logic for the case of two nonempty lists

JIRA: FUEL-170

Change-Id: I5abae6fc950cdabe064b5402d9555cedf81cfc23
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
upstream/fuel patch | blob | history

diff --git a/upstream/fuel b/upstream/fuel
index f96b162..91c1fe2 160000 (submodule)
--- a/upstream/fuel
+++ b/upstream/fuel
@@ -1 +1 @@
-Subproject commit f96b162d0b7ab0839a5961a23f5f57cf320168e4
+Subproject commit 91c1fe20f85a09d40e095ae7feaae872eb25b0fa