Merge pull request #4815 from li-ang/fix_4801

Fix aggregate output across the cluster
influxdata · Nov 20, 2015 · 8ef5a05 · 8ef5a05
2 parents 1e9e7c2 + a712a1c
commit 8ef5a05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - [#4766](https://github.com/influxdb/influxdb/pull/4766): Update CLI usage output. Thanks @aneshas
 - [#4804](https://github.com/influxdb/influxdb/pull/4804): Complete lint for services/admin. Thanks @nii236
 - [#4796](https://github.com/influxdb/influxdb/pull/4796): Check point without fields. Thanks @CrazyJvm
+- [#4815](https://github.com/influxdb/influxdb/pull/4815): Added `Time` field into aggregate output across the cluster. Thanks @li-ang
 
 ## v0.9.5 [unreleased]
 

diff --git a/cluster/shard_mapper.go b/cluster/shard_mapper.go
@@ -231,6 +231,7 @@ func (r *RemoteMapper) NextChunk() (chunk interface{}, err error) {
 			aggValues = append(aggValues, v)
 		}
 		mo.Values = []*tsdb.MapperValue{&tsdb.MapperValue{
+			Time:  mvj[0].Time,
 			Value: aggValues,
 			Tags:  mvj[0].Tags,
 		}}