Started by upstream project "org.subshare" build number 5858org.subsharejob/org.subshare/false13833068737org.subshare.www #442016-04-25_22-23-17false44SUCCESS1461615797000https://www.codewizards.co:443/jenkins/user/mn/my-views/view/All/job/org.subshare.www/44//trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptoRepoFileMerger.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/persistence/AssignCryptoRepoFileRepoFileListener.java/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoCryptoRepoFile.java/trunk/org.subshare/org.subshare.test/src/test/java/org/subshare/test/CollisionRepoToRepoSyncIT.javahttps://www.codewizards.co:443/jenkins/user/mnMarco Nguitragool-Schulze40614616149178752016-04-25T20:08:37.875801ZImplemented merging CryptoRepoFiles collided on the server.add/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/CryptoRepoFileMerger.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/persistence/AssignCryptoRepoFileRepoFileListener.javaedit/trunk/org.subshare/org.subshare.local/src/main/java/org/subshare/local/persistence/HistoCryptoRepoFile.javaedit/trunk/org.subshare/org.subshare.test/src/test/java/org/subshare/test/CollisionRepoToRepoSyncIT.java406Marco Nguitragool-Schulze/trunk/org.subshare/org.subshare.test/src/test/java/org/subshare/test/CollisionRepoToRepoSyncIT.javahttps://www.codewizards.co:443/jenkins/user/mnMarco Nguitragool-Schulze40514616078729612016-04-25T18:11:12.961288ZFixed one test leaking RepoToRepoSyncCoordinator into following test.edit/trunk/org.subshare/org.subshare.test/src/test/java/org/subshare/test/CollisionRepoToRepoSyncIT.java405Marco Nguitragool-Schulzesvnhttps://www.codewizards.co/svn/subshare/trunk/org.subshare406https://www.codewizards.co:443/jenkins/user/mnMarco Nguitragool-Schulze3.0.4