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

Authored by Ben Carmen <benjamin_carmen@hms.harvard.edu> on Oct 7 2015, 18:16.

Description

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

Committed

Ben Carmen <benjamin_carmen@hms.harvard.edu>

Oct 7 2015, 18:16

Pushed

mickmis

Mar 14 2017, 15:12

Parents

Branches

Unknown

Tags

Unknown

Ben Carmen <benjamin_carmen@hms.harvard.edu> committed R2664:c201a766b092: Merge remote-tracking branch 'origin/develop' into develop (authored by Ben Carmen <benjamin_carmen@hms.harvard.edu>).Oct 7 2015, 18:16

Commit	Author	Details	Committed
21f6428421fd	David Walend	New text for AdapterMappingProblem	Oct 7 2015
29902405f5e3	David Walend	Removed the require() because blank fields are OK.	Oct 7 2015
dc8e0dba422d	David Walend	Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…	Oct 7 2015
68886afeb467	David Walend	A little cleanup of Problem	Oct 7 2015

				Path
	M			adapter/adapter-service/src/main/scala/net/shrine/adapter/Adapter.scala
	M			adapter/adapter-service/src/main/scala/net/shrine/adapter/AdapterMappingException.scala
	M			apps/shrine-app/src/main/scala/net/shrine/jersey/DefaultShrineResourceConfig.scala
	M			apps/shrine-app/src/main/scala/net/shrine/jersey/ShrineResourceConfig.scala
	M			commons/util/src/main/scala/net/shrine/problem/Problem.scala