Merge remote-tracking branch 'origin/develop' into develop
20e6063ac1b4
Actions

Authored by Ben Carmen <benjamin_carmen@hms.harvard.edu> on Feb 4 2016, 20:32.

Description

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

Committed

Ben Carmen <benjamin_carmen@hms.harvard.edu>

Feb 4 2016, 20:32

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

Ben Carmen <benjamin_carmen@hms.harvard.edu> committed R2664:20e6063ac1b4: Merge remote-tracking branch 'origin/develop' into develop (authored by Ben Carmen <benjamin_carmen@hms.harvard.edu>).Feb 4 2016, 20:32

	Commit			Author	Details	Committed
	1ea5937a612a			David Walend	Getting a QueryResult out of the db	Feb 4 2016
	dffc299274c1			David Walend	Breakdown types table	Feb 4 2016

				Path
	M			commons/util/src/main/scala/net/shrine/util/XmlDateHelper.scala
	M			commons/util/src/main/scala/net/shrine/util/XmlGcEnrichments.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