Code Review
/
fuel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
75614ea
)
Remove extra empty line
71/21171/2
author
Peter Barabas
<peter.barabas@ericsson.com>
Thu, 15 Sep 2016 11:03:11 +0000
(13:03 +0200)
committer
Jonas Bjurel
<jonas.bjurel@ericsson.com>
Fri, 16 Sep 2016 11:39:10 +0000
(11:39 +0000)
Change-Id: I462a99b42d05b979c4f1904e7309e87ddd94d1bb
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
deploy/deploy-config.py
patch
|
blob
|
history
diff --git
a/deploy/deploy-config.py
b/deploy/deploy-config.py
index
436002d
..
8896080
100644
(file)
--- a/
deploy/deploy-config.py
+++ b/
deploy/deploy-config.py
@@
-137,7
+137,6
@@
def merge_networks(list_1, list_2):
return [new_nets.get(net.get('name'), net) for net in list_1]
-
def merge_dicts(dict1, dict2):
for k in set(dict1).union(dict2):
if k in dict1 and k in dict2: