Merge branch '1.22.2.x' into develop
9e140e118556
Actions

Authored by Ty <Ty_Coghlan@hms.harvard.edu> on Nov 23 2016, 19:58.

Description

Merge branch '1.22.2.x' into develop

Committed

Ty <Ty_Coghlan@hms.harvard.edu>

Nov 23 2016, 19:58

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

Ty <Ty_Coghlan@hms.harvard.edu> committed R2664:9e140e118556: Merge branch '1.22.2.x' into develop (authored by Ty <Ty_Coghlan@hms.harvard.edu>).Nov 23 2016, 19:58

	Commit			Author	Details	Committed
	f830558696d0			Ty	qep url fix, testing broadcaster url fix	Nov 23 2016

				Path
	M			adapter/adapter-service/src/main/scala/net/shrine/adapter/service/AdapterResource.scala
	M			apps/shrine-app/src/main/scala/net/shrine/status/StatusJaxrs.scala
	M			apps/shrine-app/src/main/scala/net/shrine/wiring/ShrineOrchestrator.scala
	M			apps/shrine-app/src/test/scala/net/shrine/wiring/NodeHandleTest.scala
	M			tools/scanner/src/test/scala/net/shrine/utilities/scanner/BroadcastServiceScannerClientTest.scala