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

Authored by Ben Carmen <benjamin_carmen@hms.harvard.edu> on Oct 19 2015, 23:05.

Description

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

Committed

Ben Carmen <benjamin_carmen@hms.harvard.edu>

Oct 19 2015, 23:05

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

Ben Carmen <benjamin_carmen@hms.harvard.edu> committed R2664:d36836e3eeb0: Merge remote-tracking branch 'origin/develop' into develop (authored by Ben Carmen <benjamin_carmen@hms.harvard.edu>).Oct 19 2015, 23:05

	Commit			Author	Details	Committed
	72b59b961dd4			David Walend	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Oct 19 2015
	be357e0f2736			David Walend	SHRINE-1052 now using create boolean config values to signal when to create a…	Oct 16 2015

				Path
	M			adapter/adapter-api/src/main/resources/reference.conf
	M			adapter/adapter-api/src/main/scala/net/shrine/adapter/service/AdapterConfig.scala
	M			adapter/adapter-service/src/main/scala/net/shrine/adapter/audit/AdapterAuditDb.scala
	M			adapter/adapter-service/src/test/resources/shrine.conf
	M			adapter/adapter-service/src/test/scala/net/shrine/adapter/audit/AdapterAuditDbTest.scala
	M			apps/shrine-app/src/main/scala/net/shrine/wiring/ShrineConfig.scala
	M			commons/config/src/test/resources/shrine-no-optional-configs.conf
	M			qep/service/src/main/resources/reference.conf
	M			qep/service/src/main/scala/net/shrine/service/QepConfig.scala
	M			qep/service/src/main/scala/net/shrine/service/QepConfigSource.scala
	M			qep/service/src/main/scala/net/shrine/service/audit/QepAuditDb.scala
	M			qep/service/src/test/resources/shrine.conf