Merge branch 'feature/new-crypto' into develop
3e4e094e8447
Actions

Authored by Ty <Ty_Coghlan@hms.harvard.edu> on Oct 13 2016, 19:06.

Description

Merge branch 'feature/new-crypto' into develop

Committed

Ty <Ty_Coghlan@hms.harvard.edu>

Oct 13 2016, 19:06

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

Ty <Ty_Coghlan@hms.harvard.edu> committed R2664:3e4e094e8447: Merge branch 'feature/new-crypto' into develop (authored by Ty <Ty_Coghlan@hms.harvard.edu>).Oct 13 2016, 19:06

	Commit			Author	Details	Committed
	a4e626ceed18			Ty	fixed up status tests	Oct 13 2016

				Path
	M			apps/shrine-app/src/main/scala/net/shrine/status/StatusJaxrs.scala
	D			apps/shrine-app/src/test/resources/reference.conf
	M			apps/shrine-app/src/test/resources/shrine.conf
	M			apps/shrine-app/src/test/scala/net/shrine/status/StatusJaxrsTest.scala
	M			commons/client/src/main/scala/net/shrine/client/EndpointConfig.scala
	M			commons/config/src/main/scala/net/shrine/config/mappings/ClasspathAdapterMappingsSource.scala
	M			commons/ont-support/src/main/scala/net/shrine/ont/data/OntClientOntologyMetadata.scala