Diffusion SHRINE MedCo Fork e68ef1d35f16

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

Authored by Ben Carmen <benjamin_carmen@hms.harvard.edu> on Jan 30 2016, 22:21.

Description

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

Details

Committed

Ben Carmen <benjamin_carmen@hms.harvard.edu>

Jan 30 2016, 22:21

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:73bc2b1c8e06: Got rid of ReadPDORequest and associated bits
R2664:033fc768b659: Huge refactor of dashboard

Branches

Unknown

Tags

Unknown

Event Timeline

Ben Carmen <benjamin_carmen@hms.harvard.edu> committed R2664:e68ef1d35f16: Merge remote-tracking branch 'origin/develop' into develop (authored by Ben Carmen <benjamin_carmen@hms.harvard.edu>).Jan 30 2016, 22:21

Merged Changes

Commit	Author	Details	Committed
73bc2b1c8e06	David Walend	Got rid of ReadPDORequest and associated bits	Jan 29 2016
064b3b77cf6a	David Walend	Planning out the next part of local/local	Jan 29 2016
fd3950857159	David Walend	Some stray actor systems after the merge	Jan 29 2016
f875ded313d0	David Walend	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Jan 29 2016
16bf34625454	David Walend	Added some logging to see what else happens	Jan 29 2016

Changes (21)

				Path
	D			adapter/adapter-service/src/main/scala/net/shrine/adapter/ReadPdoAdapter.scala
	M			apps/dashboard-app/src/main/scala/net/shrine/dashboard/DashboardService.scala
	M			commons/protocol/src/main/scala/net/shrine/protocol/AbstractShrineRequestI2b2UnmarshallerCompanion.scala
	M			commons/protocol/src/main/scala/net/shrine/protocol/HandleableAdminShrineRequest.scala
	M			commons/protocol/src/main/scala/net/shrine/protocol/I2b2RequestHandler.scala
	M			commons/protocol/src/main/scala/net/shrine/protocol/QueryResult.scala
	D			commons/protocol/src/main/scala/net/shrine/protocol/ReadPdoRequest.scala
	M			commons/protocol/src/main/scala/net/shrine/protocol/ShrineRequest.scala
	M			commons/protocol/src/main/scala/net/shrine/protocol/ShrineRequestHandler.scala
	D			commons/protocol/src/main/scala/net/shrine/protocol/handlers/ReadPdoHandler.scala
	M			commons/protocol/src/test/scala/net/shrine/protocol/HandleableI2b2RequestTest.scala
	D			commons/protocol/src/test/scala/net/shrine/protocol/ReadPdoRequestTest.scala
	M			commons/protocol/src/test/scala/net/shrine/protocol/ShrineMessageTest.scala
	M			commons/protocol/src/test/scala/net/shrine/protocol/ShrineRequestTest.scala
	M			qep/service/src/main/scala/net/shrine/qep/AbstractQepService.scala
	M			qep/service/src/main/scala/net/shrine/qep/I2b2QepService.scala
	M			qep/service/src/main/scala/net/shrine/qep/QepService.scala
	M			qep/service/src/main/scala/net/shrine/qep/ShrineResource.scala
	M			qep/service/src/main/scala/net/shrine/qep/queries/QepQueryDb.scala
	M			qep/service/src/test/scala/net/shrine/qep/ShrineResourceJaxrsTest.scala
	M			qep/service/src/test/scala/net/shrine/qep/ShrineResourceTest.scala