]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
Merge remote-tracking branch 'origin/valuationcontrol' into CSPACE-6235-plus-6310
authorAron Roberts <aron@socrates.berkeley.edu>
Fri, 3 Oct 2014 22:35:02 +0000 (15:35 -0700)
committerAron Roberts <aron@socrates.berkeley.edu>
Fri, 3 Oct 2014 22:35:02 +0000 (15:35 -0700)
commitc368d4ca082406d2f331272d82339c33083d2091
tree63c9265b283e416c4756dcaeec67309a24f54656
parentf8b60f9b6f64b5676811264c0992bc830a4f64d5
parent2b34c26e383f089b75b38570138a65941f063c4d
Merge remote-tracking branch 'origin/valuationcontrol' into CSPACE-6235-plus-6310

Conflicts:
services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
services/build.xml
services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
services/pom.xml
services/JaxRsServiceProvider/pom.xml
services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
services/build.xml
services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
services/common/src/main/resources/db/postgresql/load_id_generators.sql
services/pom.xml