[Bigdata-commit] SF.net SVN: bigdata:[8133] branches/RDR

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

Revision: 8133
          http://sourceforge.net/p/bigdata/code/8133
Author:   thompsonbry
Date:     2014-04-21 20:59:35 +0000 (Mon, 21 Apr 2014)
Log Message:
-----------
Merging in changes from the main development branch into the RDR branch.

{{{
merge https://svn.code.sf.net/p/bigdata/code/branches/BIGDATA_RELEASE_1_3_0 /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA5JournalServer.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/StressTestHA3JournalServer.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestAll.java
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA1SnapshotPolicy.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3JournalServerTestCase.java
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA5JournalServerTestCase.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3BackupTestCase.java
    R   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-B.properties
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-D.properties
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-D.config
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHANamespace.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/zkClient.config
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3CancelQuery.java
    R   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-A.properties
    R   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-C.properties
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-E.properties
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA5JournalServerWithHALogs.java
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-E.config
    C   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA1SnapshotPolicy2.java
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA1JournalServer.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3JournalServer.java
     U  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/java/com/bigdata/disco
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/java/com/bigdata/disco
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/java/com/bigdata/attr
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/java/com/bigdata/attr
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    C   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/SnapshotManager.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HARestore.java
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/java/com/bigdata/util/config
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/java/com/bigdata/util/config
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-perf/lubm
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-perf/lubm
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-perf/uniprot/src
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-perf/uniprot/src
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-perf/uniprot
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-perf/uniprot
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-perf/btc/src/resources
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-perf/btc/src/resources
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-perf/btc
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-perf/btc
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-perf
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-perf
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/src/resources/HAJournal/HAJournal.config
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/src/resources/bin/config
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/src/resources/bin/config
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/src/resources/bin/startHAServices
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/src/resources/bin/HARestore
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/src/resources/etc/default
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/src/resources/etc/default/bigdataHA
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/src/resources/etc/default/bigdata
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/src/resources/etc/init.d/bigdataHA
    D   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/src/resources/etc/bigdata
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/lib/jetty
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/lib/jetty
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/bop/joinGraph
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/bop/joinGraph
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/bop/util
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/bop/util
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/jsr166
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/jsr166
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithSplits.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithRedirect.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/btree/data/AbstractNodeDataRecordTestCase.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/cache/StressTestGlobalLRU.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/io/writecache/TestRWWriteCacheService.java
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/util/httpd
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/test/com/bigdata/util/httpd
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/search/FullTextIndex.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/search/ReadIndexTask.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/bop/solutions/MemoryGroupByOp.java
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/bop/aggregate
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/bop/aggregate
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/bop/util
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/bop/util
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/bop/joinGraph
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/bop/joinGraph
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/jsr166
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/jsr166
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/sparse/GlobalRowStoreHelper.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/service/proxy/ClientAsynchronousIterator.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/service/ndx/pipeline/AbstractSubtask.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/btree/AbstractBTree.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/btree/PageStats.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/btree/data/DefaultNodeCoder.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/counters/ProcessReaderHelper.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/counters/win/TypeperfCollector.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/rwstore/FixedAllocator.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/rwstore/RWStore.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/rwstore/RWWriteCacheService.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/io/writecache/BufferedWrite.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/htree/raba
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/htree/raba
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/journal/DumpJournal.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/journal/WORMStrategy.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/journal/RWStrategy.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/resources/AsynchronousOverflowTask.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/java/com/bigdata/util/CSVReader.java
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/Vagrantfile
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/default
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/default/test
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/default/test/default_test.rb
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/metadata.rb
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/CHANGELOG.txt
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/Berksfile
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/Gemfile
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/createSecurityGroup.py
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/setHosts.py
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/createCluster.sh
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/chefignore
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/default.rb
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/java7.rb
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/ssd.rb
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/README.txt
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/Thorfile
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/aws.rc
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/default
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/default/bigdataHA.erb
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/init.d
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/init.d/bigdataHA.erb
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/jetty.xml.erb
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/log4jHA.properties.erb
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/zoo.cfg.erb
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/build.xml
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/osgi
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/osgi
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-compatibility
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-compatibility
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/test/com/bigdata/rdf/sail/831.ttl
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/test/com/bigdata/rdf/sail/bench
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/test/com/bigdata/rdf/sail/bench
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/test/com/bigdata/rdf/sail/874.ttl
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/test/com/bigdata/rdf/sail/831.rq
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/test/com/bigdata/rdf/sail/StressTest_ClosedByInterrupt_RW.java
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/test/com/bigdata/rdf/sail/874.rq
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/bench
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/bench
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/SD.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java
    C   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MultiTenancyServlet.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/StatusServlet.java
    C   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java
    C   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/named-graphs-ticket-888b.rq
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.srx
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.srx
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/count_distinct_emptyResult.trig
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.rq
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestNamedGraphs.java
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.ttl
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.ttl
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/count_distinct_emptyResult.srx
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/count_emptyResult.rq
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestUnions.java
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.rq
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/named-graphs-ticket-888.trig
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/named-graphs-ticket-888.srx
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/count_emptyResult.trig
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874b.rq
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestAggregationQuery.java
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/count_emptyResult.srx
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/named-graphs-ticket-888.rq
    A   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/count_distinct_emptyResult.rq
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/internal
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/internal
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/relation
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/test/com/bigdata/rdf/relation
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/changesets
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/changesets
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/error
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/error
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/store/BDS.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SearchServiceFactory.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchOptimizer.java
    U   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTBindingAssigner.java
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/internal
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/internal
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/relation
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/relation
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/util
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/java/com/bigdata/rdf/util
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/samples
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-rdf/src/samples
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/LEGAL
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/LEGAL
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/lib
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/lib
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src/test/it/unimi/dsi
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src/test/it/unimi/dsi
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src/test/it/unimi
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src/test/it/unimi
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src/test
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src/test
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src/java/it/unimi
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src/java/it/unimi
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src/java/it
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src/java/it
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src/java
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src/java
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils/src
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/dsi-utils
    --- Merging r7913 through r8131 into /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
     G  /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE
    Merge complete.
    ===== File Statistics: =====
    Deleted: 4
    Added: 74
    Updated: 54
    ==== Property Statistics: =====
    Merged: 50
    Updated: 1
    ==== Conflict Statistics: =====
    File conflicts: 5
}}}

I am working to reconcile the conflicts and validate the merge...

----

The file conflicts were:
{{{
    C   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java
    C   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java
    C   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MultiTenancyServlet.java
    C   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java
    C   /Users/bryan/Documents/workspace/RDR_CLEAN_FOR_MERGE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java
}}}


HAJournalServer: Resolved conflict in getNSSPort().

AbstractHAJournalServerTestCase: Resolved conflict in generation of the URL of the end point.

MultiTenancyServlet: Resolved a conflict around transaction protection for the description of the graphs and the refactor to parameterize the graph description request in support of the new workbench.

BigdataRDFContext: Conflict on imports.  getKBInfo() was removed in the main branch.

RemoteRepository: Resolved conflicts around use of log.warn() for IOException (versus ignoring the problem).

----

I have run through the NSS test suite, the AST test suite, and the QUADS mode SAIL test suite.  Things look good.  Committing to CI.

See #526 (RDR)

Revision Links:
--------------
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131
    http://sourceforge.net/p/bigdata/code/7913
    http://sourceforge.net/p/bigdata/code/8131

Modified Paths:
--------------
    branches/RDR/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java
    branches/RDR/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java
    branches/RDR/bigdata/src/java/com/bigdata/bop/solutions/MemoryGroupByOp.java
    branches/RDR/bigdata/src/java/com/bigdata/btree/AbstractBTree.java
    branches/RDR/bigdata/src/java/com/bigdata/btree/PageStats.java
    branches/RDR/bigdata/src/java/com/bigdata/btree/data/DefaultNodeCoder.java
    branches/RDR/bigdata/src/java/com/bigdata/counters/ProcessReaderHelper.java
    branches/RDR/bigdata/src/java/com/bigdata/counters/win/TypeperfCollector.java
    branches/RDR/bigdata/src/java/com/bigdata/io/writecache/BufferedWrite.java
    branches/RDR/bigdata/src/java/com/bigdata/io/writecache/WriteCache.java
    branches/RDR/bigdata/src/java/com/bigdata/io/writecache/WriteCacheService.java
    branches/RDR/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
    branches/RDR/bigdata/src/java/com/bigdata/journal/DumpJournal.java
    branches/RDR/bigdata/src/java/com/bigdata/journal/RWStrategy.java
    branches/RDR/bigdata/src/java/com/bigdata/journal/WORMStrategy.java
    branches/RDR/bigdata/src/java/com/bigdata/resources/AsynchronousOverflowTask.java
    branches/RDR/bigdata/src/java/com/bigdata/rwstore/FixedAllocator.java
    branches/RDR/bigdata/src/java/com/bigdata/rwstore/RWStore.java
    branches/RDR/bigdata/src/java/com/bigdata/rwstore/RWWriteCacheService.java
    branches/RDR/bigdata/src/java/com/bigdata/search/FullTextIndex.java
    branches/RDR/bigdata/src/java/com/bigdata/search/ReadIndexTask.java
    branches/RDR/bigdata/src/java/com/bigdata/service/ndx/pipeline/AbstractSubtask.java
    branches/RDR/bigdata/src/java/com/bigdata/service/proxy/ClientAsynchronousIterator.java
    branches/RDR/bigdata/src/java/com/bigdata/sparse/GlobalRowStoreHelper.java
    branches/RDR/bigdata/src/java/com/bigdata/util/CSVReader.java
    branches/RDR/bigdata/src/test/com/bigdata/btree/data/AbstractNodeDataRecordTestCase.java
    branches/RDR/bigdata/src/test/com/bigdata/cache/StressTestGlobalLRU.java
    branches/RDR/bigdata/src/test/com/bigdata/io/writecache/TestRWWriteCacheService.java
    branches/RDR/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java
    branches/RDR/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithRedirect.java
    branches/RDR/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithSplits.java
    branches/RDR/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HARestore.java
    branches/RDR/bigdata-jini/src/java/com/bigdata/journal/jini/ha/SnapshotManager.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3BackupTestCase.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3JournalServerTestCase.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/StressTestHA3JournalServer.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestAll.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3JournalServer.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/zkClient.config
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTSearchOptimizer.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SearchServiceFactory.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTBindingAssigner.java
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/store/BDS.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestAggregationQuery.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestNamedGraphs.java
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestUnions.java
    branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java
    branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServletContextListener.java
    branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/MultiTenancyServlet.java
    branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/SD.java
    branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/StatusServlet.java
    branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java
    branches/RDR/build.xml
    branches/RDR/src/resources/HAJournal/HAJournal.config
    branches/RDR/src/resources/bin/startHAServices
    branches/RDR/src/resources/etc/init.d/bigdataHA

Added Paths:
-----------
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/Berksfile
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/CHANGELOG.txt
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/Gemfile
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/README.txt
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/Thorfile
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/Vagrantfile
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/aws.rc
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/createCluster.sh
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/createSecurityGroup.py
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/setHosts.py
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/chefignore
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/default/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/default/test/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/default/test/default_test.rb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/metadata.rb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/default.rb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/java7.rb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/ssd.rb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/default/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/default/bigdataHA.erb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/init.d/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/init.d/bigdataHA.erb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/jetty.xml.erb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/log4jHA.properties.erb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/zoo.cfg.erb
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA5JournalServerTestCase.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-D.config
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-E.config
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA1JournalServer.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA1SnapshotPolicy.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA1SnapshotPolicy2.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3CancelQuery.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA5JournalServer.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA5JournalServerWithHALogs.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHANamespace.java
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-A.properties
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-B.properties
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-C.properties
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-D.properties
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-E.properties
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/count_distinct_emptyResult.rq
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/count_distinct_emptyResult.srx
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/count_distinct_emptyResult.trig
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/count_emptyResult.rq
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/count_emptyResult.srx
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/count_emptyResult.trig
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/named-graphs-ticket-888.rq
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/named-graphs-ticket-888.srx
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/named-graphs-ticket-888.trig
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/named-graphs-ticket-888b.rq
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.rq
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.srx
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_831.ttl
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.rq
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.srx
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874.ttl
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/ticket_874b.rq
    branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/831.rq
    branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/831.ttl
    branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/874.rq
    branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/874.ttl
    branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/StressTest_ClosedByInterrupt_RW.java
    branches/RDR/src/resources/bin/HARestore
    branches/RDR/src/resources/etc/default/
    branches/RDR/src/resources/etc/default/bigdata/
    branches/RDR/src/resources/etc/default/bigdataHA

Removed Paths:
-------------
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/Berksfile
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/CHANGELOG.txt
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/Gemfile
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/README.txt
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/Thorfile
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/Vagrantfile
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/aws.rc
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/createCluster.sh
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/createSecurityGroup.py
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/setHosts.py
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/chefignore
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/default/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/default/test/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/default/test/default_test.rb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/metadata.rb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/default.rb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/java7.rb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/ssd.rb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/default/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/default/bigdataHA.erb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/init.d/
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/init.d/bigdataHA.erb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/jetty.xml.erb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/log4jHA.properties.erb
    branches/RDR/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/zoo.cfg.erb
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-A.properties
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-B.properties
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-C.properties
    branches/RDR/src/resources/etc/bigdata/
    branches/RDR/src/resources/etc/default/bigdata/
    branches/RDR/src/resources/etc/default/bigdataHA

Property Changed:
----------------
    branches/RDR/bigdata/lib/jetty/
    branches/RDR/bigdata/src/java/com/bigdata/bop/aggregate/
    branches/RDR/bigdata/src/java/com/bigdata/bop/joinGraph/
    branches/RDR/bigdata/src/java/com/bigdata/bop/util/
    branches/RDR/bigdata/src/java/com/bigdata/htree/raba/
    branches/RDR/bigdata/src/java/com/bigdata/jsr166/
    branches/RDR/bigdata/src/test/com/bigdata/bop/joinGraph/
    branches/RDR/bigdata/src/test/com/bigdata/bop/util/
    branches/RDR/bigdata/src/test/com/bigdata/jsr166/
    branches/RDR/bigdata/src/test/com/bigdata/util/httpd/
    branches/RDR/bigdata-compatibility/
    branches/RDR/bigdata-jini/src/java/com/bigdata/attr/
    branches/RDR/bigdata-jini/src/java/com/bigdata/disco/
    branches/RDR/bigdata-jini/src/java/com/bigdata/util/config/
    branches/RDR/bigdata-jini/src/test/com/bigdata/journal/jini/ha/
    branches/RDR/bigdata-perf/
    branches/RDR/bigdata-perf/btc/
    branches/RDR/bigdata-perf/btc/src/resources/
    branches/RDR/bigdata-perf/lubm/
    branches/RDR/bigdata-perf/uniprot/
    branches/RDR/bigdata-perf/uniprot/src/
    branches/RDR/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate/
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/changesets/
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/error/
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/internal/
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/relation/
    branches/RDR/bigdata-rdf/src/java/com/bigdata/rdf/util/
    branches/RDR/bigdata-rdf/src/samples/
    branches/RDR/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate/
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/internal/
    branches/RDR/bigdata-rdf/src/test/com/bigdata/rdf/relation/
    branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/bench/
    branches/RDR/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets/
    branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/bench/
    branches/RDR/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/
    branches/RDR/dsi-utils/
    branches/RDR/dsi-utils/LEGAL/
    branches/RDR/dsi-utils/lib/
    branches/RDR/dsi-utils/src/
    branches/RDR/dsi-utils/src/java/
    branches/RDR/dsi-utils/src/java/it/
    branches/RDR/dsi-utils/src/java/it/unimi/
    branches/RDR/dsi-utils/src/test/
    branches/RDR/dsi-utils/src/test/it/unimi/
    branches/RDR/dsi-utils/src/test/it/unimi/dsi/
    branches/RDR/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom/
    branches/RDR/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom/
    branches/RDR/osgi/
    branches/RDR/src/resources/bin/config/

Index: branches/RDR/bigdata/lib/jetty
===================================================================

--- branches/RDR/bigdata/lib/jetty	2014-04-21 19:15:16 UTC (rev 8132)
+++ branches/RDR/bigdata/lib/jetty	2014-04-21 20:59:35 UTC (rev 8133)

Property changes on: branches/RDR/bigdata/lib/jetty
___________________________________________________________________
Modified: svn:mergeinfo
## -1,6 +1,7 ##
+/branches/BIGDATA_MGC_HA1_HA5/bigdata/lib/jetty:8025-8122
 /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/lib/jetty:6769-6785
 /branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/jetty:6766-7380
-/branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty:7665-7913
+/branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty:7665-8131
 /branches/INT64_BRANCH/bigdata/lib/jetty:4486-4522
 /branches/MGC_1_3_0/bigdata/lib/jetty:7609-7752
 /branches/QUADS_QUERY_BRANCH/bigdata/lib/jetty:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
\ No newline at end of property
Index: branches/RDR/bigdata/src/java/com/bigdata/bop/aggregate
===================================================================
--- branches/RDR/bigdata/src/java/com/bigdata/bop/aggregate	2014-04-21 19:15:16 UTC (rev 8132)
+++ branches/RDR/bigdata/src/java/com/bigdata/bop/aggregate	2014-04-21 20:59:35 UTC (rev 8133)

Property changes on: branches/RDR/bigdata/src/java/com/bigdata/bop/aggregate
___________________________________________________________________
Modified: svn:mergeinfo
## -1,6 +1,7 ##
+/branches/BIGDATA_MGC_HA1_HA5/bigdata/src/java/com/bigdata/bop/aggregate:8025-8122
 /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/aggregate:6769-6785
 /branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/aggregate:6766-7380
-/branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/aggregate:7665-7913
+/branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/aggregate:7665-8131
 /branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4486-4522
 /branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/aggregate:7609-7752
 /branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
\ No newline at end of property
Modified: branches/RDR/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java
===================================================================
--- branches/RDR/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java	2014-04-21 19:15:16 UTC (rev 8132)
+++ branches/RDR/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java	2014-04-21 20:59:35 UTC (rev 8133)
@@ -610,7 +610,7 @@
      * <p>
      * If the deadline has expired, {@link IRunningQuery#cancel(boolean)} will
      * be invoked. In order for a compute bound operator to terminate in a
-     * timely fashion, it MUST periodically test {@link Thread#isInterrupted()}.
+     * timely fashion, it MUST periodically test {@link Thread#interrupted()}.
      * <p>
      * Note: The deadline of a query may be set at most once. Thus, a query
      * which is entered into the {@link #deadlineQueue} may not have its

Modified: branches/RDR/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java
===================================================================
--- branches/RDR/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java	2014-04-21 19:15:16 UTC (rev 8132)
+++ branches/RDR/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java	2014-04-21 20:59:35 UTC (rev 8133)
@@ -1834,7 +1834,7 @@
 
                             if (bindex++ % 50 == 0) {
                                 // Periodically check for an interrupt.
-                                if (Thread.currentThread().isInterrupted())
+                                if (Thread.interrupted())
                                     throw new InterruptedException();
                             }
 

Index: branches/RDR/bigdata/src/java/com/bigdata/bop/joinGraph
===================================================================
--- branches/RDR/bigdata/src/java/com/bigdata/bop/joinGraph	2014-04-21 19:15:16 UTC (rev 8132)
+++ branches/RDR/bigdata/src/java/com/bigdata/b...
 
[truncated message content]

[Bigdata-commit] SF.net SVN: bigdata:[8133] branches/RDR

Fast, scalable, robust graph database platform

[Bigdata-commit] SF.net SVN: bigdata:[8133] branches/RDR