]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
Merge remote-tracking branch 'upstream/master' into CSPACE-5271
authorAron Roberts <aron@socrates.berkeley.edu>
Tue, 11 Sep 2012 18:36:27 +0000 (11:36 -0700)
committerAron Roberts <aron@socrates.berkeley.edu>
Tue, 11 Sep 2012 18:36:27 +0000 (11:36 -0700)
commitb6f493aa0e10ccd44aa76bd5a2c73f2ed3a8faa2
tree2ac10746ca6aa9943852f96ad2488d77565e5d75
parentf44c8c8348044a9f8af7aa41ca1b38438ae724c4
parentd4174ce7186a6ea47f7977ff09cbfc71e7a75825
Merge remote-tracking branch 'upstream/master' into CSPACE-5271

Conflicts:
services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java
services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
services/contact/service/src/main/java/org/collectionspace/services/contact/AuthorityResourceWithContacts.java
services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java