Merge remote-tracking branch 'cspace-lyrasis/master' into dts-4.5-merge-1

author remillet <remillet@yahoo.com>

Tue, 7 Feb 2017 01:21:30 +0000 (17:21 -0800)

committer remillet <remillet@yahoo.com>

Tue, 7 Feb 2017 01:21:30 +0000 (17:21 -0800)
author remillet <remillet@yahoo.com>
Tue, 7 Feb 2017 01:21:30 +0000 (17:21 -0800)
committer remillet <remillet@yahoo.com>
Tue, 7 Feb 2017 01:21:30 +0000 (17:21 -0800)
diff --cc services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java
Simple merge
diff --cc services/common/pom.xml
Simple merge
diff --cc services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java
Simple merge
diff --cc services/common/src/main/java/org/collectionspace/services/common/init/AddIndices.java
Simple merge
author	remillet <remillet@yahoo.com>
	Tue, 7 Feb 2017 01:21:30 +0000 (17:21 -0800)
committer	remillet <remillet@yahoo.com>
	Tue, 7 Feb 2017 01:21:30 +0000 (17:21 -0800)
		1	2
services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/common/pom.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContextImpl.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/common/src/main/java/org/collectionspace/services/common/init/AddIndices.java	patch \|	diff1 \|	diff2 \|	blob \| history