]> git.aero2k.de Git - tmp/jakarta-migration.git/commit
projects / tmp / jakarta-migration.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c6b8117 0a1ed8e)
Merge branch 'botgarden_profile' into botgarden_profile-2
authorremillet <remillet@yahoo.com>
Mon, 27 Mar 2017 21:52:02 +0000 (14:52 -0700)
committerremillet <remillet@yahoo.com>
Mon, 27 Mar 2017 21:52:02 +0000 (14:52 -0700)
commitfa8ddc441694c22f7244fffc3be77ab230e159ee
tree5ee2efa0da9dbec37681a971a69f257863432957tree | snapshot
parentc6b8117df32cd0b93eaf890bbfbcc394396a65fdcommit | diff
parent0a1ed8ed4684db03654836a766b5cecd79c99d86commit | diff
Merge branch 'botgarden_profile' into botgarden_profile-2

Conflicts:
services/batch/service/src/main/java/org/collectionspace/services/batch/AbstractBatchInvocable.java
services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java
services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/BatchDocumentModelHandler.java
services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/CreateAndLinkLoanOutBatchJob.java
services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java diff1 | diff2 | blob | history
services/batch/service/pom.xml diff1 | diff2 | blob | history
services/batch/service/src/main/java/org/collectionspace/services/batch/AbstractBatchInvocable.java diff1 | diff2 | blob | history
services/batch/service/src/main/java/org/collectionspace/services/batch/BatchResource.java diff1 | diff2 | blob | history
services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/BatchDocumentModelHandler.java diff1 | diff2 | blob | history
services/batch/service/src/main/java/org/collectionspace/services/batch/nuxeo/CreateAndLinkLoanOutBatchJob.java diff1 | diff2 | blob | history
services/common/src/main/java/org/collectionspace/services/common/AbstractCollectionSpaceResourceImpl.java diff1 | diff2 | blob | history
services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java diff1 | diff2 | blob | history