Started by upstream project "org.subshare" build number 6666org.subsharejob/org.subshare/false17650668737org.subshare.www #502016-05-21_13-43-41false50SUCCESS1463831021000https://www.codewizards.co:443/jenkins/view/org.subshare/job/org.subshare.www/50//trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/Cryptree.java/trunk/org.subshare/org.subshare.local.dbrepo/src/main/java/org/subshare/local/dbrepo/transport/DbFileRepoTransportImpl.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeContext.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeImpl.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/SsLocalRepoMetaDataImpl.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/SsLocalRepoSync.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/dto/SsDeleteModificationDtoConverter.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/dto/SsDeleteModificationDtoConverterClassExtension.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CloudStorePersistenceCapableClassesProviderImpl.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CryptoRepoFile.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/DeleteRepoFileListener.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/Permission.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/PreliminaryDeletion.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/PreliminaryDeletionDao.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/SsDeleteModification.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/SsDeleteModificationClassExtension.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/transport/CryptreeFileRepoTransportImpl.java/trunk/org.subshare/org.subshare.local/src/main/resources/META-INF/services/co.codewizards.cloudstore.core.objectfactory.ClassExtension/trunk/org.subshare/org.subshare.test/src/test/java/org/subshare/test/CollisionOnClientRepoToRepoSyncIT.javahttps://www.codewizards.co:443/jenkins/user/mnMarco Nguitragool-Schulze41014638220136962016-05-21T09:13:33.696400Z* Added test for modified vs. deleted file collision. * Refactored deletion handling.edit/trunk/org.subshare/org.subshare.core/src/main/java/org/subshare/core/Cryptree.javaedit/trunk/org.subshare/org.subshare.local.dbrepo/src/main/java/org/subshare/local/dbrepo/transport/DbFileRepoTransportImpl.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeContext.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptreeImpl.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/SsLocalRepoMetaDataImpl.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/SsLocalRepoSync.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/dto/SsDeleteModificationDtoConverter.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/dto/SsDeleteModificationDtoConverterClassExtension.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CloudStorePersistenceCapableClassesProviderImpl.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/CryptoRepoFile.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/DeleteRepoFileListener.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/Permission.javaadd/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/PreliminaryDeletion.javaadd/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/PreliminaryDeletionDao.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/SsDeleteModification.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/SsDeleteModificationClassExtension.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/transport/CryptreeFileRepoTransportImpl.javaedit/trunk/org.subshare/org.subshare.local/src/main/resources/META-INF/services/co.codewizards.cloudstore.core.objectfactory.ClassExtensionedit/trunk/org.subshare/org.subshare.test/src/test/java/org/subshare/test/CollisionOnClientRepoToRepoSyncIT.java410Marco Nguitragool-Schulzesvnhttps://www.codewizards.co/svn/subshare/trunk/org.subshare410https://www.codewizards.co:443/jenkins/user/mnMarco Nguitragool-Schulze3.0.4