Homec4science
Diffusion SHRINE MedCo Fork 4540e30854a2

Merge remote-tracking branch 'origin/develop' into develop
4540e30854a2
Actions

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

Description

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

Details

Committed
Ben Carmen <benjamin_carmen@hms.harvard.edu>Oct 6 2015, 22:11
Pushed
mickmisMar 14 2017, 15:12
Parents
R2664:404f7ef643ba: Changed DESCRIPTION to PROBLEM_DESCRIPTION to avoid collision.
R2664:e0c2f8544572: Commit of latest styles.
Branches
Unknown
Tags
Unknown

Event Timeline

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

Merged Changes

CommitAuthorDetailsCommitted
404f7ef643baDavid Walend
Changed DESCRIPTION to PROBLEM_DESCRIPTION to avoid collision. 
Oct 6 2015
5363b2ad1a6aDavid Walend
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Oct 6 2015
44a18e69a78eDavid Walend
Got changes to ErrorResponse compiling 
Oct 6 2015
4c0459e02ee6David Walend
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Oct 2 2015
65152e457b7dDavid Walend
Propagated the change into some db code and got a successful build 
Oct 1 2015

Changes (40)

Path
Madapter/adapter-service/pom.xml
Madapter/adapter-service/src/main/resources/adapter-oracle.sql
Madapter/adapter-service/src/main/resources/adapter.sql
Madapter/adapter-service/src/main/scala/net/shrine/adapter/AbstractReadQueryResultAdapter.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/Adapter.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/components/QueryDefinitions.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/dao/AdapterDao.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/ShrineError.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/dao/model/squeryl/SquerylShrineError.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/dao/squeryl/SquerylAdapterDao.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/dao/squeryl/tables/ErrorResultsComponent.scala
Madapter/adapter-service/src/test/resources/adapter-h2.sql
Madapter/adapter-service/src/test/scala/net/shrine/adapter/AbstractQueryRetrievalTestCase.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/AdapterTest.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/ReadInstanceResultsAdapterTest.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/ReadQueryDefinitionAdapterTest.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/RunQueryAdapterTest.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/dao/MockAdapterDao.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/dao/model/ShrineErrorTest.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/dao/model/ShrineQueryResultTest.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/dao/squeryl/SquerylAdapterDaoTest.scala
Madapter/adapter-service/src/test/scala/net/shrine/adapter/service/AbstractI2b2AdminResourceJaxrsTest.scala
Mapps/shrine-app/src/test/scala/net/shrine/wiring/ShrineConfigTest.scala
Mcommons/auth/src/main/scala/net/shrine/authorization/PmAuthorizerComponent.scala
Mcommons/auth/src/test/scala/net/shrine/authorization/PmAuthorizerComponentTest.scala
Mcommons/ont-support/src/main/scala/net/shrine/ont/data/ShrineSqlOntologyDao.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/ShrineResponse.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/AggregatedRunQueryResponseTest.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/ErrorResponseTest.scala
Mcommons/protocol/src/test/scala/net/shrine/protocol/ShrineResponseTest.scala
Mcommons/util/src/main/scala/net/shrine/problem/Problem.scala
Mhub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/IgnoresErrorsAggregator.scala
Mhub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/PackagesErrorsAggregator.scala
Mhub/broadcaster-aggregator/src/test/scala/net/shrine/aggregation/ReadQueryResultAggregatorTest.scala
Mhub/broadcaster-aggregator/src/test/scala/net/shrine/aggregation/RunQueryAggregatorTest.scala
Mhub/broadcaster-aggregator/src/test/scala/net/shrine/broadcaster/HubBroadcastServiceTest.scala
Mhub/broadcaster-aggregator/src/test/scala/net/shrine/broadcaster/SigningBroadcastAndAggregationServiceTest.scala
Minstall/i2b2-1.7/shrine/sqlserver/adapter.sql

R2664:4540e30854a2

View Options

adapter/adapter-service/pom.xml

Loading...
View Options

adapter/adapter-service/src/main/resources/adapter-oracle.sql

Loading...
View Options

adapter/adapter-service/src/main/resources/adapter.sql

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/Adapter.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/components/QueryDefinitions.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/AdapterDao.scala

Loading...
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/squeryl/SquerylShrineError.scala

Loading...
View Options

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

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/squeryl/tables/ErrorResultsComponent.scala

Loading...
View Options

adapter/adapter-service/src/test/resources/adapter-h2.sql

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/AdapterTest.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/ReadQueryDefinitionAdapterTest.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/dao/MockAdapterDao.scala

Loading...
View Options

adapter/adapter-service/src/test/scala/net/shrine/adapter/dao/model/ShrineErrorTest.scala

Loading...
View Options

adapter/adapter-service/src/test/scala/net/shrine/adapter/dao/model/ShrineQueryResultTest.scala

Loading...
View Options

adapter/adapter-service/src/test/scala/net/shrine/adapter/dao/squeryl/SquerylAdapterDaoTest.scala

Loading...
View Options

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

Loading...
View Options

apps/shrine-app/src/test/scala/net/shrine/wiring/ShrineConfigTest.scala

Loading...
View Options

commons/auth/src/main/scala/net/shrine/authorization/PmAuthorizerComponent.scala

Loading...
View Options

commons/auth/src/test/scala/net/shrine/authorization/PmAuthorizerComponentTest.scala

Loading...
View Options

commons/ont-support/src/main/scala/net/shrine/ont/data/ShrineSqlOntologyDao.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/ShrineResponse.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/ErrorResponseTest.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

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

Loading...
View Options

hub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/PackagesErrorsAggregator.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

hub/broadcaster-aggregator/src/test/scala/net/shrine/broadcaster/HubBroadcastServiceTest.scala

Loading...
View Options

hub/broadcaster-aggregator/src/test/scala/net/shrine/broadcaster/SigningBroadcastAndAggregationServiceTest.scala

Loading...
View Options

install/i2b2-1.7/shrine/sqlserver/adapter.sql

Loading...
c4science · Help