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

Merge pull request #1807 from weaveworks/1806-restore-probe-compatibility

Browse Source 
restore compatibility of old probes with new m/t app

Fixes #1806.
This commit is contained in:
Matthias Radestock
2016-08-17 12:09:33 +01:00
committed by GitHub
parent 21cfc83a56 6ba812e82f
commit bdd97c7591
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/multitenant/aws_collector.go
View File

@@ -335,7 +335,7 @@ func (c *awsCollector) Report(ctx context.Context) (report.Report, error) {
return report.MakeReport(), err
}
return c.merger.Merge(reports), nil
return c.merger.Merge(reports).Upgrade(), nil
}
// calculateDynamoKeys generates the row & column keys for Dynamo.