]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
Merge branch 'CSPACE-5761'
authorPatrick Schmitz <pschmitz@berkeley.edu>
Fri, 14 Dec 2012 19:50:06 +0000 (11:50 -0800)
committerPatrick Schmitz <pschmitz@berkeley.edu>
Fri, 14 Dec 2012 19:50:06 +0000 (11:50 -0800)
commitb9c5f3fbac6a66622fb83f7946ae6fae48d2fff1
treed9dfa261230bf2c8a6c731eac6c608dcdac0a720
parent11d95c48c25e94c080f080da00cc1528447ace1c
parent64fdb2d3bc5a92c7c0e32cc2d0616fc7760ee7b6
Merge branch 'CSPACE-5761'

Conflicts:
services/JaxRsServiceProvider/src/main/webapp/META-INF/context.xml
services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java
services/JaxRsServiceProvider/src/main/webapp/META-INF/context.xml
services/common/pom.xml
services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
services/common/src/main/java/org/collectionspace/services/common/storage/JDBCTools.java