Homec4science
Diffusion SHRINE MedCo Fork d4051f6ff278

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

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

Description

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

Details

Committed
Ben Carmen <benjamin_carmen@hms.harvard.edu>Sep 25 2015, 20:46
Pushed
mickmisMar 14 2017, 15:12
Parents
R2664:b5b5283ce163: Test contents for an error - see if they flow all the way through
R2664:f8ee31cf7673: Update of latest styles.
Branches
Unknown
Tags
Unknown

Event Timeline

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

Merged Changes

CommitAuthorDetailsCommitted
b5b5283ce163David Walend
Test contents for an error - see if they flow all the way through 
Sep 25 2015
9e63d14f849dDavid Walend
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Sep 23 2015
a309ca32f76cDavid Walend
Test of adding extra xml 
Sep 23 2015
2205c9b63be2David Walend
Little cleanup things while exploring code 
Sep 23 2015

Changes (13)

Path
Madapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/ShrineError.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/ShrineQueryResult.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/squeryl/SquerylShrineError.scala
Mcommons/protocol/src/main/scala/net/shrine/protocol/ErrorResponse.scala
Mcommons/protocol/src/main/scala/net/shrine/protocol/QueryResult.scala
Mcommons/protocol/src/main/scala/net/shrine/protocol/singleNodeResults.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/ErrorResponseTest.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/QueryResultTest.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/ShrineResponseTest.scala
Mcommons/util/src/main/scala/net/shrine/util/SEnum.scala
Mhub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/BasicAggregator.scala
Mhub/broadcaster-aggregator/src/main/scala/net/shrine/broadcaster/AbstractBroadcastAndAggregationService.scala
Mhub/broadcaster-service/src/main/scala/net/shrine/broadcaster/service/BroadcasterMultiplexerResource.scala

R2664:d4051f6ff278

View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/ShrineError.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/ShrineQueryResult.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/squeryl/SquerylShrineError.scala

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

commons/protocol/src/test/scala/net/shrine/protocol/ErrorResponseTest.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/ShrineResponseTest.scala

Loading...
View Options

commons/util/src/main/scala/net/shrine/util/SEnum.scala

Loading...
View Options

hub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/BasicAggregator.scala

Loading...
View Options

hub/broadcaster-aggregator/src/main/scala/net/shrine/broadcaster/AbstractBroadcastAndAggregationService.scala

Loading...
View Options

hub/broadcaster-service/src/main/scala/net/shrine/broadcaster/service/BroadcasterMultiplexerResource.scala

Loading...
c4science · Help