Author: frm Revision: 1775591 Modified property: svn:log Modified: svn:log at Thu Dec 22 08:57:46 2016 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Thu Dec 22 08:57:46 2016 @@ -1,45 +1 @@ -Squashed commit of the following: - -commit 09d7bef3aadcb8166ee2e6f83a15f2bcb9392033 -Merge: b9c4dab 07222e2 -Author: Andrei Dulceanu <[email protected]> -Date: Thu Dec 22 10:44:08 2016 +0200 - - Merge branch 'upstream-trunk' into issues/OAK-5335 - -commit b9c4dab809d67c161fb320e4e896d0bda4d0dd99 -Author: Andrei Dulceanu <[email protected]> -Date: Thu Dec 22 10:41:34 2016 +0200 - - OAK-5335 - Clarify the various directories and their usages in SegmentNodeStoreService - Corrected description for REPOSITORY_HOME_DIRECTORY - -commit 73c75988c6dae34a3748f161d69fa54e292851ee -Merge: f5caf65 4aee212 -Author: Andrei Dulceanu <[email protected]> -Date: Wed Dec 21 16:14:26 2016 +0200 - - Merge branch 'upstream-trunk' into issues/OAK-5335 - -commit f5caf654bd8a77be4297ff23b616919a9a04b4cb -Author: Andrei Dulceanu <[email protected]> -Date: Wed Dec 21 16:13:20 2016 +0200 - - OAK-5335 - Clarify the various directories and there usages in SegmentNodeStoreService - Corrected mis-usage of SegmentNodeStoreService.DIRECTORY in oak-it tests related to oak-segment - Renamed getRootDirectory() to getRepositoryHome(); renamed DIRECTORY to REPOSITORY_HOME_DIRECTORY and updated description - Added JavaDoc - -commit 6d28083d24c749071fd2e5e904233d9333b4334c -Merge: 3e3cc61 a099521 -Author: Andrei Dulceanu <[email protected]> -Date: Tue Dec 20 15:57:30 2016 +0200 - - Merge branch 'upstream-trunk' into issues/OAK-5335 - -commit 3e3cc61d83b2fc0111497eb6f559f21f69078c62 -Author: Andrei Dulceanu <[email protected]> -Date: Tue Dec 20 15:32:01 2016 +0200 - - OAK-5335 - Clarify the various directories and there usages in SegmentNodeStoreService - Removed getBaseDirectory(), renamed getDirectory() to getSegmentDirectory() and consistently used getRootDirectory() in SegmentNodeStoreService +OAK-5335 - Clarify the various directories and their usages in SegmentNodeStoreService
