github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-05-22 00:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup: standardise rhs of Merge dominates

Browse Source
This commit is contained in:
Bryan Boreham
2019-10-19 17:38:49 +00:00
parent 8be6ca5e1e
commit bcd1fe95a0
5 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
report/report.go
View File

@@ -352,7 +352,7 @@ func (r Report) Merge(other Report) Report {
}
// UnsafeMerge merges another Report into the receiver. The original is modified.
// TODO: r must be at least as new as other
// 'r' is taken to be older, and Node string values in 'other' will override
func (r *Report) UnsafeMerge(other Report) {
r.DNS = r.DNS.Merge(other.DNS)
r.Sampling = r.Sampling.Merge(other.Sampling)