Merge branch 'feature/new-crypto' into develop
be127c79186c
Actions

Authored by Ty <Ty_Coghlan@hms.harvard.edu> on Oct 14 2016, 18:37.

Description

Merge branch 'feature/new-crypto' into develop

Committed

Ty <Ty_Coghlan@hms.harvard.edu>

Oct 14 2016, 18:37

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

Ty <Ty_Coghlan@hms.harvard.edu> committed R2664:be127c79186c: Merge branch 'feature/new-crypto' into develop (authored by Ty <Ty_Coghlan@hms.harvard.edu>).Oct 14 2016, 18:37

	Commit			Author	Details	Committed
	7541b470f1ff			Ty	summary fix, qep trustModel, testing changes, various style changes	Oct 14 2016

				Path
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/qep.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/qep.tpl.html
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/summary.controller.js
	M			apps/dashboard-app/src/main/js/src/app/diagnostic/views/summary.tpl.html
	M			apps/dashboard-app/src/main/js/test/admin/status/qep.json
	M			apps/dashboard-app/src/test/resources/teststatus/qep
	M			apps/proxy/src/main/scala/net/shrine/proxy/ShrineProxyServlet.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/resources/shrine.conf
	M			apps/shrine-app/src/test/scala/net/shrine/status/StatusJaxrsTest.scala
	M			commons/auth/src/main/scala/net/shrine/authorization/StewardQueryAuthorizationService.scala
	M			commons/crypto/src/main/scala/net/shrine/crypto/KeyStoreType.scala
	M			commons/crypto/src/main/scala/net/shrine/crypto/SigningCertStrategy.scala
	M			commons/crypto/src/main/scala/net/shrine/crypto/TrustParam.scala
	M			qep/service/src/main/resources/reference.conf
	M			qep/service/src/main/scala/net/shrine/qep/QueryEntryPointComponents.scala
	A			qep/service/src/main/scala/net/shrine/qep/TrustModel.scala