summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
4c8210a)
* Update docs/submodules/oom.git from branch 'master'
to
c0e930f0795c5ea439d48fa6de2acc6b32ffb1d7
- Fix dictionary merge
Previous version was overwriting Demo key with last preload_data.json structure
instead of a merge. Have to iterate over keys
Issue-ID: INT-1038
Change-Id: Ia15428b3aae7cbc681a96d50656d278b5ef07b42
Signed-off-by: Brian Freeman <bf1936@att.com>
-Subproject commit 4d7e44933519920d73054b33a5aa30a228cbc0ae
+Subproject commit c0e930f0795c5ea439d48fa6de2acc6b32ffb1d7