Homec4science
Diffusion SHRINE MedCo Fork 89d2fde5f453

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
89d2fde5f453
Actions

Authored by Ty <Ty_Coghlan@hms.harvard.edu> on Sep 14 2016, 22:54.

Description

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop

Details

Committed
Ty <Ty_Coghlan@hms.harvard.edu>Sep 14 2016, 22:54
Pushed
mickmisMar 14 2017, 15:12
Parents
R2664:995af4a84287: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
R2664:2e7d44a01b2b: path was truncuated, changed lookup from shrine.networkStatusQuery to just…
Branches
Unknown
Tags
Unknown

Event Timeline

Ty <Ty_Coghlan@hms.harvard.edu> committed R2664:89d2fde5f453: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by Ty <Ty_Coghlan@hms.harvard.edu>).Sep 14 2016, 22:54

Merged Changes

CommitAuthorDetailsCommitted
995af4a84287David Walend
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Sep 14 2016
2b47beaab25fDavid Walend
Configurable obfuscation, SHRINE-1546 
Sep 14 2016

Changes (14)

Path
Madapter/adapter-service/src/main/resources/reference.conf
Madapter/adapter-service/src/main/scala/net/shrine/adapter/AbstractReadQueryResultAdapter.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/AdapterComponents.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/Obfuscator.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/ReadInstanceResultsAdapter.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/ReadQueryResultAdapter.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/RunQueryAdapter.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/AbstractQueryRetrievalTestCase.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/ObfuscatorTest.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/ReadInstanceResultsAdapterTest.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/ReadQueryResultAdapterTest.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/RunQueryAdapterTest.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/service/I2b2AdminResourceEndToEndJaxrsTest.scala
Mintegration/src/test/scala/net/shrine/integration/NetworkSimulationTest.scala

R2664:89d2fde5f453

View Options

adapter/adapter-service/src/main/resources/reference.conf

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/AbstractReadQueryResultAdapter.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/AdapterComponents.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/Obfuscator.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/ReadInstanceResultsAdapter.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/ReadQueryResultAdapter.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/RunQueryAdapter.scala

Loading...
View Options

adapter/adapter-service/src/test/scala/net/shrine/adapter/AbstractQueryRetrievalTestCase.scala

Loading...
View Options

adapter/adapter-service/src/test/scala/net/shrine/adapter/ObfuscatorTest.scala

Loading...
View Options

adapter/adapter-service/src/test/scala/net/shrine/adapter/ReadInstanceResultsAdapterTest.scala

Loading...
View Options

adapter/adapter-service/src/test/scala/net/shrine/adapter/ReadQueryResultAdapterTest.scala

Loading...
View Options

adapter/adapter-service/src/test/scala/net/shrine/adapter/RunQueryAdapterTest.scala

Loading...
View Options

adapter/adapter-service/src/test/scala/net/shrine/adapter/service/I2b2AdminResourceEndToEndJaxrsTest.scala

Loading...
View Options

integration/src/test/scala/net/shrine/integration/NetworkSimulationTest.scala

Loading...
c4science · Help