]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
Merge branch 'master' into concept
authorRay Lee <rhlee@berkeley.edu>
Tue, 20 Mar 2012 20:50:15 +0000 (13:50 -0700)
committerRay Lee <rhlee@berkeley.edu>
Tue, 20 Mar 2012 20:50:15 +0000 (13:50 -0700)
commit5169b06ecaa33fc0665b75bdd082339e0dcb9e97
treed45025cf77661e52a4edaa14a08fed20a00a9a30
parentcf4c8ce4cfbe48680b4fc1f74ba2037c83155683
parentc5730166fe278676eec051d06550661aec0931d3
Merge branch 'master' into concept

Conflicts:
services/JaxRsServiceProvider/pom.xml
services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
services/build.xml
services/pom.xml
services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
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/pom.xml
services/relation/service/pom.xml
services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java