[Bigdata-commit] SF.net SVN: bigdata:[3443] branches/dev-btm

[<sgo...@us...>]

Revision: 3443
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3443&view=rev
Author:   sgossard
Date:     2010-08-12 20:09:13 +0000 (Thu, 12 Aug 2010)

Log Message:
-----------
[dev-btm] : Updating mergeinfo for dev-btm branch to reflect correct changeset eligibility from maven_scaleout branch.

Property Changed:
----------------
    branches/dev-btm/
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr/
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco/
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/util/config/
    branches/dev-btm/bigdata-perf/
    branches/dev-btm/bigdata-perf/lubm/lib/
    branches/dev-btm/bigdata-perf/lubm/src/resources/
    branches/dev-btm/bigdata-perf/lubm/src/resources/answers (U1)/
    branches/dev-btm/bigdata-perf/lubm/src/resources/config/
    branches/dev-btm/bigdata-perf/lubm/src/resources/logging/
    branches/dev-btm/bigdata-perf/lubm/src/resources/scripts/
    branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util/
    branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/
    branches/dev-btm/dsi-utils/LEGAL/
    branches/dev-btm/dsi-utils/lib/
    branches/dev-btm/dsi-utils/src/
    branches/dev-btm/dsi-utils/src/test/
    branches/dev-btm/dsi-utils/src/test/it/
    branches/dev-btm/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
    branches/dev-btm/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
    branches/dev-btm/osgi/


Property changes on: branches/dev-btm
___________________________________________________________________
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/fko:3150-3194
/trunk:2575-2594,2596-2877,2882-2903,2910-3430
   + /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/fko:3150-3194
/branches/maven_scaleout:3379-3439,3442
/trunk:2575-2594,2596-2877,2882-2903,2910-3430


Property changes on: branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-jini/src/java/com/bigdata/attr:3270-3430
   + /branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/attr:3379-3439,3442
/trunk/bigdata-jini/src/java/com/bigdata/attr:3270-3430


Property changes on: branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-jini/src/java/com/bigdata/disco:3270-3430
   + /branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/disco:3379-3439,3442
/trunk/bigdata-jini/src/java/com/bigdata/disco:3270-3430


Property changes on: branches/dev-btm/bigdata-jini/src/java/com/bigdata/util/config
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-jini/src/java/com/bigdata/util/config:3270-3430
   + /branches/maven_scaleout/bigdata-jini/src/java/com/bigdata/util/config:3379-3439,3442
/trunk/bigdata-jini/src/java/com/bigdata/util/config:3270-3430


Property changes on: branches/dev-btm/bigdata-perf
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-perf:3270-3430
   + /branches/maven_scaleout/bigdata-perf:3379-3439,3442
/trunk/bigdata-perf:3270-3430


Property changes on: branches/dev-btm/bigdata-perf/lubm/lib
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-perf/lubm/lib:3270-3338,3340-3430
   + /branches/maven_scaleout/bigdata-perf/lubm/lib:3379-3439,3442
/trunk/bigdata-perf/lubm/lib:3270-3338,3340-3430


Property changes on: branches/dev-btm/bigdata-perf/lubm/src/resources
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-perf/lubm/src/resources:3270-3338,3340-3430
   + /branches/maven_scaleout/bigdata-perf/lubm/src/resources:3379-3439,3442
/trunk/bigdata-perf/lubm/src/resources:3270-3338,3340-3430


Property changes on: branches/dev-btm/bigdata-perf/lubm/src/resources/answers (U1)
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /branches/maven_scaleout/bigdata-perf/lubm/src/resources/answers (U1):3379-3439,3442


Property changes on: branches/dev-btm/bigdata-perf/lubm/src/resources/config
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /branches/maven_scaleout/bigdata-perf/lubm/src/resources/config:3379-3439,3442


Property changes on: branches/dev-btm/bigdata-perf/lubm/src/resources/logging
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /branches/maven_scaleout/bigdata-perf/lubm/src/resources/logging:3379-3439,3442


Property changes on: branches/dev-btm/bigdata-perf/lubm/src/resources/scripts
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /branches/maven_scaleout/bigdata-perf/lubm/src/resources/scripts:3379-3439,3442


Property changes on: branches/dev-btm/bigdata-rdf/src/java/com/bigdata/rdf/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:3270-3430
   + /branches/maven_scaleout/bigdata-rdf/src/java/com/bigdata/rdf/util:3379-3439,3442
/trunk/bigdata-rdf/src/java/com/bigdata/rdf/util:3270-3430


Property changes on: branches/dev-btm/bigdata-sails/src/java/com/bigdata/rdf/sail/bench
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3270-3430
   + /branches/maven_scaleout/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3379-3439,3442
/trunk/bigdata-sails/src/java/com/bigdata/rdf/sail/bench:3270-3430


Property changes on: branches/dev-btm/dsi-utils/LEGAL
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dsi-utils/LEGAL:3270-3430
   + /branches/maven_scaleout/dsi-utils/LEGAL:3379-3439,3442
/trunk/dsi-utils/LEGAL:3270-3430


Property changes on: branches/dev-btm/dsi-utils/lib
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dsi-utils/lib:3270-3430
   + /branches/maven_scaleout/dsi-utils/lib:3379-3439,3442
/trunk/dsi-utils/lib:3270-3430


Property changes on: branches/dev-btm/dsi-utils/src
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dsi-utils/src:3270-3430
   + /branches/maven_scaleout/dsi-utils/src:3379-3439,3442
/trunk/dsi-utils/src:3270-3430


Property changes on: branches/dev-btm/dsi-utils/src/test
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dsi-utils/src/test:2960-2965,2967-3430
   + /branches/maven_scaleout/dsi-utils/src/test:3379-3439,3442
/trunk/dsi-utils/src/test:2960-2965,2967-3430


Property changes on: branches/dev-btm/dsi-utils/src/test/it
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dsi-utils/src/test/it:3270-3430
   + /branches/maven_scaleout/dsi-utils/src/test/it:3379-3439,3442
/trunk/dsi-utils/src/test/it:3270-3430


Property changes on: branches/dev-btm/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:2960-2965,2967-3430
   + /branches/maven_scaleout/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:3379-3439,3442
/trunk/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom:2960-2965,2967-3430


Property changes on: branches/dev-btm/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:2960-2965,2967-3430
   + /branches/maven_scaleout/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:3379-3439,3442
/trunk/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom:2960-2965,2967-3430


Property changes on: branches/dev-btm/osgi
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/osgi:3270-3430
   + /branches/maven_scaleout/osgi:3379-3439,3442
/trunk/osgi:3270-3430


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