Homec4science
Diffusion SHRINE MedCo Fork bcc1cde44947

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

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

Description

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

Details

Committed
Ben Carmen <benjamin_carmen@hms.harvard.edu>Sep 29 2015, 21:25
Pushed
mickmisMar 14 2017, 15:12
Parents
R2664:0ddbed40338f: Tweaked argument order to make more sense
R2664:7d1c0df30495: Commit of style fixes.
Branches
Unknown
Tags
Unknown

Event Timeline

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

Merged Changes

CommitAuthorDetailsCommitted
0ddbed40338fDavid Walend
Tweaked argument order to make more sense 
Sep 29 2015
db5b816ee751David Walend
Got xml and i2b2 flows working for ProblemDigest in QueryResult 
Sep 29 2015
f8a05cbd0759David Walend
Added test of i2b2 xml 
Sep 29 2015
d9ddb13f2fd3David Walend
Got a None for ProblemDigest working with QueryResult 
Sep 28 2015
8a34c81569e6David Walend
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Sep 28 2015
c1bef85c2730David Walend
Added XML processing for ProblemDigest, optional ProblemDigest parameter for… 
Sep 28 2015

Changes (18)

Path
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/dao/squeryl/SquerylAdapterDaoTest.scala
Mcommons/client/src/test/scala/net/shrine/client/JerseyShrineClientTest.scala
Mcommons/protocol/src/main/scala/net/shrine/protocol/QueryResult.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/AggregatedReadInstanceResultsResponseTest.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/AggregatedReadQueryResultResponseTest.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/AggregatedRunQueryResponseTest.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/QueryResultTest.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/ReadQueryResultResponseTest.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/RunQueryResponseTest.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/ShrineResponseTest.scala
Mcommons/util/src/main/scala/net/shrine/problem/Problem.scala
Mcommons/util/src/main/scala/net/shrine/serialization/I2b2Marshaller.scala
Acommons/util/src/test/scala/net/shrine/problem/ProblemDigestTest.scala
Mhub/broadcaster-aggregator/src/test/scala/net/shrine/aggregation/ReadQueryResultAggregatorTest.scala
Mhub/broadcaster-aggregator/src/test/scala/net/shrine/aggregation/RunQueryAggregatorTest.scala
Mqep/service/src/test/scala/net/shrine/service/ShrineResourceTest.scala

R2664:bcc1cde44947

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/dao/squeryl/SquerylAdapterDaoTest.scala

Loading...
View Options

commons/client/src/test/scala/net/shrine/client/JerseyShrineClientTest.scala

Loading...
View Options

commons/protocol/src/main/scala/net/shrine/protocol/QueryResult.scala

Loading...
View Options

commons/protocol/src/test/scala/net/shrine/protocol/AggregatedReadInstanceResultsResponseTest.scala

Loading...
View Options

commons/protocol/src/test/scala/net/shrine/protocol/AggregatedReadQueryResultResponseTest.scala

Loading...
View Options

commons/protocol/src/test/scala/net/shrine/protocol/AggregatedRunQueryResponseTest.scala

Loading...
View Options

commons/protocol/src/test/scala/net/shrine/protocol/QueryResultTest.scala

Loading...
View Options

commons/protocol/src/test/scala/net/shrine/protocol/ReadQueryResultResponseTest.scala

Loading...
View Options

commons/protocol/src/test/scala/net/shrine/protocol/RunQueryResponseTest.scala

Loading...
View Options

commons/protocol/src/test/scala/net/shrine/protocol/ShrineResponseTest.scala

Loading...
View Options

commons/util/src/main/scala/net/shrine/problem/Problem.scala

Loading...
View Options

commons/util/src/main/scala/net/shrine/serialization/I2b2Marshaller.scala

Loading...
View Options

commons/util/src/test/scala/net/shrine/problem/ProblemDigestTest.scala

Loading...
View Options

hub/broadcaster-aggregator/src/test/scala/net/shrine/aggregation/ReadQueryResultAggregatorTest.scala

Loading...
View Options

hub/broadcaster-aggregator/src/test/scala/net/shrine/aggregation/RunQueryAggregatorTest.scala

Loading...
View Options

qep/service/src/test/scala/net/shrine/service/ShrineResourceTest.scala

Loading...
c4science · Help