[Bigdata-commit] SF.net SVN: bigdata:[3661] branches/bbb_cleanup

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3661
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3661&view=rev
Author:   resendes
Date:     2010-09-28 14:44:43 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
Merge from maven_scaleout branch

Property Changed:
----------------
    branches/bbb_cleanup/
    branches/bbb_cleanup/bigdata-core/
    branches/bbb_cleanup/bigdata-core/bigdata-perf/
    branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources/
    branches/bbb_cleanup/bigdata-core/dsi-utils/LEGAL/
    branches/bbb_cleanup/bigdata-core/dsi-utils/lib/
    branches/bbb_cleanup/bigdata-core/dsi-utils/src/
    branches/bbb_cleanup/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
    branches/bbb_cleanup/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
    branches/bbb_cleanup/bigdata-core/osgi/
    branches/bbb_cleanup/bigdata-core/src/main/deploy/bin/
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/boot/
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
    branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
    branches/bbb_cleanup/bigdata-core/src/main/java/
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/attr/
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/disco/
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench/
    branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/util/
    branches/bbb_cleanup/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties
    branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
    branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
    branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
    branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
    branches/bbb_cleanup/bigdata-core/src/test/java/

Property changes on: branches/bbb_cleanup
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440,3443,3463,3469-3470
/branches/fko:3150-3194
/branches/maven_scaleout:3379-3438,3588-3645
/trunk:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
   + /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440,3443,3463,3469-3470
/branches/fko:3150-3194
/branches/maven_scaleout:3379-3438,3588-3660
/trunk:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542

Property changes on: branches/bbb_cleanup/bigdata-core
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/maven_scaleout/bigdata-core:3588-3645
/trunk:3499
   + /branches/maven_scaleout/bigdata-core:3588-3660
/trunk:3499

Property changes on: branches/bbb_cleanup/bigdata-core/bigdata-perf
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/maven_scaleout/bigdata-core/bigdata-perf:3588-3645
/trunk/bigdata-perf:3379-3541
   + /branches/maven_scaleout/bigdata-core/bigdata-perf:3588-3660
/trunk/bigdata-perf:3379-3541

Property changes on: branches/bbb_cleanup/bigdata-core/bigdata-perf/lubm/src/resources
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-btm/bigdata-perf/lubm/src/resources:2574-3440
/branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources:3588-3645
/trunk/bigdata-perf/lubm/src/resources:3379-3541
   + /branches/dev-btm/bigdata-perf/lubm/src/resources:2574-3440
/branches/maven_scaleout/bigdata-core/bigdata-perf/lubm/src/resources:3588-3660
/trunk/bigdata-perf/lubm/src/resources:3379-3541

Property changes on: branches/bbb_cleanup/bigdata-core/dsi-utils/LEGAL
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/maven_scaleout/bigdata-core/dsi-utils/LEGAL:3588-3645
/trunk/dsi-utils/LEGAL:3379-3430,3499
   + /branches/maven_scaleout/bigdata-core/dsi-utils/LEGAL:3588-3660
/trunk/dsi-utils/LEGAL:3379-3430,3499

Property changes on: branches/bbb_cleanup/bigdata-core/dsi-utils/lib
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/maven_scaleout/bigdata-core/dsi-utils/lib:3588-3645
/trunk/dsi-utils/lib:3379-3430,3499
   + /branches/maven_scaleout/bigdata-core/dsi-utils/lib:3588-3660
/trunk/dsi-utils/lib:3379-3430,3499

Property changes on: branches/bbb_cleanup/bigdata-core/dsi-utils/src
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/maven_scaleout/bigdata-core/dsi-utils/src:3588-3645
/trunk/dsi-utils/src:3379-3430,3499
   + /branches/maven_scaleout/bigdata-core/dsi-utils/src:3588-3660
/trunk/dsi-utils/src:3379-3430,3499

Property changes on: branches/bbb_cleanup/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/maven_scaleout/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3588-3645
/trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
   + /branches/maven_scaleout/bigdata-core/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3588-3660
/trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499

Property changes on: branches/bbb_cleanup/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/maven_scaleout/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3588-3645
/trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499
   + /branches/maven_scaleout/bigdata-core/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3588-3660
/trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3379-3430,3499

Property changes on: branches/bbb_cleanup/bigdata-core/osgi
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/maven_scaleout/bigdata-core/osgi:3588-3645
/trunk/osgi:3379-3430,3499
   + /branches/maven_scaleout/bigdata-core/osgi:3588-3660
/trunk/osgi:3379-3430,3499

Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/bin
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/bin:3588-3645
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
   + /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/bin:3588-3660
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542

Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini:3588-3645
/trunk/src/main/deploy/var/config/jini:3499
/trunk/src/resources/config:3516-3528
   + /branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini:3588-3660
/trunk/src/main/deploy/var/config/jini:3499
/trunk/src/resources/config:3516-3528

Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3588-3645
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/src/resources/config/bigdataCluster.config:3516-3528
   + /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3588-3660
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/src/resources/config/bigdataCluster.config:3516-3528

Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/boot
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/boot:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/boot/config:3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/boot:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3438,3588-3645
/trunk/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
   + /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/boot:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/boot:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/boot:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/boot/config:3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/boot:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3438,3588-3660
/trunk/bigdata-core/src/main/deploy/var/config/jini/boot:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542

Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3588-3645
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
   + /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3588-3660
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542

Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463,3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging:3588-3645
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
   + /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463,3469-3470
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging:3588-3660
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542

Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3588-3645
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
   + /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3588-3660
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542

Property changes on: branches/bbb_cleanup/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3588-3645
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
   + /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3588-3660
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542

Property changes on: branches/bbb_cleanup/bigdata-core/src/main/java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/java:2594-3237
/branches/dev-btm/bigdata/src/java:3463
/branches/dev-btm/bigdata-core/src/main/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java:3463,3469-3470
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/java:3588-3645
/trunk/bigdata/src/java:3507
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/bigdata-rdf/src/java:3542
   + /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/java:2594-3237
/branches/dev-btm/bigdata/src/java:3463
/branches/dev-btm/bigdata-core/src/main/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/java:3463,3469-3470
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/branches/maven_scaleout/bigdata-core/src/main/java:3588-3660
/trunk/bigdata/src/java:3507
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/bigdata-rdf/src/java:3542

Property changes on: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/attr
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:3463,3469-3470
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/attr:3588-3645
/trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
   + /branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:3463,3469-3470
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/attr:3588-3660
/trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430

Property changes on: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/disco
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:3463,3469-3470
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/disco:3588-3645
/trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430
   + /branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:3463,3469-3470
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/disco:3588-3660
/trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430

Property changes on: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3463
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench:3588-3645
/trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3379-3430
   + /branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3463
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench:3588-3660
/trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3379-3430

Property changes on: branches/bbb_cleanup/bigdata-core/src/main/java/com/bigdata/rdf/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:3463
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util:3588-3645
/trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:3379-3430,3542
   + /branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util:3463
/branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util:3588-3660
/trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:3379-3430,3542

Property changes on: branches/bbb_cleanup/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/maven_scaleout/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties:3588-3645
/trunk/bigdata-sails/src/samples/com/bigdata/samples/fastload.properties:3503
/trunk/src/samples-sail/com/bigdata/samples/fastload.properties:3499
   + /branches/maven_scaleout/bigdata-core/src/samples-sail/com/bigdata/samples/fastload.properties:3588-3660
/trunk/bigdata-sails/src/samples/com/bigdata/samples/fastload.properties:3503
/trunk/src/samples-sail/com/bigdata/samples/fastload.properties:3499

Property changes on: branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3588-3645
/trunk/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
   + /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3588-3660
/trunk/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542

Property changes on: branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/config/testfed.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3588-3645
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
   + /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/config/testfed.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3588-3660
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542

Property changes on: branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/testfed.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:3588-3645
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
   + /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/testfed.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:3588-3660
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542

Property changes on: branches/bbb_cleanup/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3588-3645
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
   + /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2594-3237
/branches/dev-btm/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3463
/branches/fko/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3150-3194
/branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3588-3660
/trunk/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542

Property changes on: branches/bbb_cleanup/bigdata-core/src/test/java
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/java:2594-3237
/branches/dev-btm/bigdata/src/test:3463
/branches/dev-btm/bigdata-core/src/test/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test:3463
/branches/dev-btm/bigdata-rdf/src/test:3463
/branches/dev-btm/bigdata-sails/src/test:3463
/branches/fko/bigdata-core/src/test/java:3150-3194
/branches/maven_scaleout/bigdata-core/src/test/java:3588-3645
/trunk/bigdata-core/src/test/java:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/bigdata-rdf/src/test:3542
/trunk/bigdata-sails/src/test:3542
   + /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/test/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/test/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/test/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/test/java:2594-3237
/branches/dev-btm/bigdata/src/test:3463
/branches/dev-btm/bigdata-core/src/test/java:2574-3440,3443,3463,3469-3470
/branches/dev-btm/bigdata-jini/src/test:3463
/branches/dev-btm/bigdata-rdf/src/test:3463
/branches/dev-btm/bigdata-sails/src/test:3463
/branches/fko/bigdata-core/src/test/java:3150-3194
/branches/maven_scaleout/bigdata-core/src/test/java:3588-3660
/trunk/bigdata-core/src/test/java:3379-3430,3432-3460,3476-3499,3503,3507,3516-3528,3542
/trunk/bigdata-rdf/src/test:3542
/trunk/bigdata-sails/src/test:3542

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bigdata-commit] SF.net SVN: bigdata:[3661] branches/bbb_cleanup

Fast, scalable, robust graph database platform

[Bigdata-commit] SF.net SVN: bigdata:[3661] branches/bbb_cleanup