github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 02:00:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nodes.Merge should Merge Node(s)!

Browse Source
This commit is contained in:
Tom Wilkie
2015-09-15 07:25:14 +00:00
parent 766d8772d7
commit 7eeb768787
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
report/topology.go
View File

@@ -66,9 +66,10 @@ func (n Nodes) Copy() Nodes {
func (n Nodes) Merge(other Nodes) Nodes {
cp := n.Copy()
for k, v := range other {
if _, ok := cp[k]; !ok { // don't overwrite
cp[k] = v.Copy()
if n, ok := cp[k]; ok { // don't overwrite
v = v.Merge(n)
}
cp[k] = v
}
return cp
}