Merge remote-tracking branch 'origin/develop' into develop
9d0e19798440
Actions

Authored by Ben Carmen <benjamin_carmen@hms.harvard.edu> on Feb 2 2016, 19:50.

Description

Merge remote-tracking branch 'origin/develop' into develop

Committed

Ben Carmen <benjamin_carmen@hms.harvard.edu>

Feb 2 2016, 19:50

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

Ben Carmen <benjamin_carmen@hms.harvard.edu> committed R2664:9d0e19798440: Merge remote-tracking branch 'origin/develop' into develop (authored by Ben Carmen <benjamin_carmen@hms.harvard.edu>).Feb 2 2016, 19:50

Commit	Author	Details	Committed
3a5bc041c7f5	David Walend	Now attempting to save part of QueryResults in the DB	Feb 2 2016
0b4d7f6fa098	David Walend	Matched fields in a QueryResult with fields in the database	Feb 2 2016
ccb416e4cc48	David Walend	A little extra logging to try to figure out what one of the aggregators is	Feb 2 2016
b809ecd7759b	David Walend	Start of query result tables	Feb 2 2016

				Path
	M			commons/protocol/src/main/scala/net/shrine/protocol/AggregatedRunQueryResponse.scala
	M			commons/protocol/src/main/scala/net/shrine/protocol/QueryResult.scala
	M			qep/service/src/main/scala/net/shrine/qep/AbstractQepService.scala
	M			qep/service/src/main/scala/net/shrine/qep/queries/QepQueryDb.scala
	M			qep/service/src/test/scala/net/shrine/qep/queries/QepQueryDbTest.scala