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

Authored by Ben Carmen <benjamin_carmen@hms.harvard.edu> on Sep 11 2015, 21:22.

Description

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

Committed

Ben Carmen <benjamin_carmen@hms.harvard.edu>

Sep 11 2015, 21:22

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

Ben Carmen <benjamin_carmen@hms.harvard.edu> committed R2664:f3b8a306f881: Merge remote-tracking branch 'origin/develop' into develop (authored by Ben Carmen <benjamin_carmen@hms.harvard.edu>).Sep 11 2015, 21:22

Commit	Author	Details	Committed
ebc45c26721b	David Walend	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Sep 11 2015
c861d13e4361	David Walend	Refactoring DB code before writing the data mining wiki page	Sep 11 2015
421fa102d16b	David Walend	Reorder before making sure all names are consistent	Sep 11 2015

				Path
	M			adapter/adapter-service/src/main/scala/net/shrine/adapter/audit/AdapterAuditDb.scala
	M			adapter/adapter-service/src/main/sql/mysql.ddl
	M			adapter/adapter-service/src/test/scala/net/shrine/adapter/audit/AdapterAuditDbTest.scala
	M			qep/service/src/main/scala/net/shrine/service/audit/QepAuditDb.scala
	D			qep/service/src/main/scala/net/shrine/service/audit/QepQueryAuditData.scala
	M			qep/service/src/main/sql/mysql.ddl