]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
Merge branch 'CSPACE-5564-REM-A' into CSPACE-5564-REM-B
authorRichard Millet <remillet@berkeley.edu>
Mon, 4 Feb 2013 17:01:32 +0000 (09:01 -0800)
committerRichard Millet <remillet@berkeley.edu>
Mon, 4 Feb 2013 17:01:32 +0000 (09:01 -0800)
commit45207c67fc94d4805f2404ec0c133a1b89ae037e
treea638123c30ff671687b2e0d61a289c132e575872
parent9a3a252f81cb3c6e89824d80a8e630514ff574c6
parentd8fa9f41245be4fdaf14f4b1a7a9431aa22737e8
Merge branch 'CSPACE-5564-REM-A' into CSPACE-5564-REM-B

Conflicts:
services/authentication/service/src/main/java/org/collectionspace/authentication/spring/SpringAuthNContext.java
services/authentication/service/src/main/java/org/collectionspace/authentication/spring/SpringAuthNContext.java
services/build.xml
services/report/client/src/main/java/org/collectionspace/services/client/ReportClient.java
services/report/service/src/main/java/org/collectionspace/services/report/nuxeo/ReportDocumentModelHandler.java