Homec4science
Diffusion SHRINE MedCo Fork 5ed682f41d99

Merge branch 'release/1.20.0' into develop
5ed682f41d99
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Nov 3 2015, 16:14.

Description

Merge branch 'release/1.20.0' into develop

Details

Committed
David Walend <david_walend@hms.harvard.edu>Nov 3 2015, 16:14
Pushed
mickmisMar 14 2017, 15:12
Parents
R2664:59908e29cff7: Added NodeId to RemoteAdapterClient and strung it through the test code.
R2664:5358b449f362: Merge branch 'release/1.20.0' into develop
Branches
Unknown
Tags
Unknown

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:5ed682f41d99: Merge branch 'release/1.20.0' into develop (authored by David Walend <david_walend@hms.harvard.edu>).Nov 3 2015, 16:14

Merged Changes

CommitAuthorDetailsCommitted
59908e29cff7David Walend
Added NodeId to RemoteAdapterClient and strung it through the test code. 
Nov 3 2015
cb0416b18c0aBen Carmen
Merge remote-tracking branch 'origin/release/1.20.0' into release/1.20.0 
Nov 2 2015
70ac62021ef7Ben Carmen
Fix for SHRINE 1101 
Nov 2 2015
c53d0af4cf8dBen Carmen
fix for SHRINE-1101 
Nov 2 2015
ea56c04a9886Ben Carmen
Fix of SHRINE-1197 
Nov 2 2015

Changes (15)

Path
Madapter/adapter-api/src/main/scala/net/shrine/adapter/client/RemoteAdapterClient.scala
Mapps/shrine-app/src/main/scala/net/shrine/wiring/NodeHandleSource.scala
Mapps/shrine-app/src/test/scala/net/shrine/wiring/NodeHandleSourceTest.scala
Mapps/steward-app/src/main/js/src/app/dashboard/history/history-table/query-detail.tpl.html
Mapps/steward-app/src/main/js/src/app/dashboard/history/history.js
Mapps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail.tpl.html
Mapps/steward-app/src/main/js/src/app/dashboard/topics/topics.js
Mcommons/protocol/src/main/scala/net/shrine/protocol/NodeId.scala
Mcommons/protocol/src/main/scala/net/shrine/protocol/QueryResult.scala
Mhub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/PackagesErrorsAggregator.scala
Mintegration/src/test/scala/net/shrine/integration/AbstractAdapterResourceJaxRsTest.scala
Mintegration/src/test/scala/net/shrine/integration/AbstractHubComponent.scala
Mintegration/src/test/scala/net/shrine/integration/AdapterResourceEndToEndJaxRsTimeoutTest.scala
Mintegration/src/test/scala/net/shrine/integration/OneQepOneHubTwoSpokesJaxrsTest.scala
Mtools/scanner/src/main/scala/net/shrine/utilities/scanner/ScannerModule.scala

R2664:5ed682f41d99

View Options

adapter/adapter-api/src/main/scala/net/shrine/adapter/client/RemoteAdapterClient.scala

Loading...
View Options

apps/shrine-app/src/main/scala/net/shrine/wiring/NodeHandleSource.scala

Loading...
View Options

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

Loading...
View Options

apps/steward-app/src/main/js/src/app/dashboard/history/history-table/query-detail.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/src/app/dashboard/history/history.js

Loading...
View Options

apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/src/app/dashboard/topics/topics.js

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

tools/scanner/src/main/scala/net/shrine/utilities/scanner/ScannerModule.scala

Loading...
c4science · Help