Details

    • Type: New Feature
    • Status: Done
    • Resolution: Done
    • Affects Version/s: BIGDATA_RELEASE_1_1_0
    • Fix Version/s: None
    • Component/s: Journal

      Description

      Provide high availability for the Journal, including both the RWStore and WORM backends.

      See https://sourceforge.net/apps/trac/bigdata/ticket/623 (HA TXS / TXS Bottleneck)
      See https://sourceforge.net/apps/trac/bigdata/ticket/645 (HA Backup)
      See https://sourceforge.net/apps/trac/bigdata/ticket/652 (Compress replicated and logged in HA)
      See https://sourceforge.net/apps/trac/bigdata/ticket/662 (Latency on followers during commit on leader)
      See https://sourceforge.net/apps/trac/bigdata/ticket/670 (Accumulating HALog files cause latency for HA commit)
      See https://sourceforge.net/apps/trac/bigdata/ticket/671 (Query on follower fails during UPDATE on leader)
      See https://sourceforge.net/apps/trac/bigdata/ticket/673 (DGC in release time consensus protocol causes native thread leak in HAJournalServer at each commit)
      See https://sourceforge.net/apps/trac/bigdata/ticket/674 (WCS write cache compaction causes errors in RWS postHACommit())
      See https://sourceforge.net/apps/trac/bigdata/ticket/678 (DGC Thread Leak: sendHALogForWriteSet())
      See https://sourceforge.net/apps/trac/bigdata/ticket/679 (HAJournalServer can not restart due to logically empty log files)
      See https://sourceforge.net/apps/trac/bigdata/ticket/681 (HAJournalServer deadlock: pipelineRemove() and getLeaderId())
      See https://sourceforge.net/apps/trac/bigdata/ticket/695 (HAJournalServer reports "follower" but is in SeekConsensus and is not participating in commits)
      See https://sourceforge.net/apps/trac/bigdata/ticket/718 (HAJournalServer needs to handle ZK client connection loss)
      See https://sourceforge.net/apps/trac/bigdata/ticket/720 (HA3 simultaneous service start failure)
      See https://sourceforge.net/apps/trac/bigdata/ticket/721 (Support HA1 configurations)
      See https://sourceforge.net/apps/trac/bigdata/ticket/722 (Test HA5 configurations)
      See https://sourceforge.net/apps/trac/bigdata/ticket/723 (HA wire pulling and sudden kill testing)

      See https://docs.google.com/presentation/d/1IdKQaBouV-a3Bjblk8PtXk-L29Rf_8VjInw7xWKwMDA/edit?usp=sharing (State Transitions for the HAJournalServer)
      See https://docs.google.com/document/d/1eWkRzpgeJZWt8GPMH55Oh8HHYsdVNIaMJtct1RD0CbQ/edit?usp=sharing (Test Suite status for HA State Transitions)
      See https://docs.google.com/document/d/14FO2yJFv_7uc5N0tvYboU-H6XbLEFpvu-G8RhAzvxrk/edit?usp=sharing (TXS design document)
      See https://sourceforge.net/apps/mediawiki/bigdata/index.php?title=HAJournalServer (Wiki page for the HA replication cluster)

        Activity

        Hide
        bryanthompson bryanthompson added a comment -

        @ r7270.

        Merging r7213 through r7270 from branches/BIGDATA_RELEASE_1_2_0 into branches/BIGDATA_READ_CACHE

        merge --depth=infinity https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_2_0 /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            --- Merging r7213 through r7270 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/jsk-dl.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/outrigger-dl.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/fiddler-dl.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/phoenix-dl.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/norm-dl.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/group-dl.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/mahalo-dl.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/reggie-dl.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/browser-dl.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/sdm-dl.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/mercury-dl.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-ext/jsk-policy.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/preferredlistgen.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/outrigger.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/sharedvm.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/phoenix.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/phoenix-init.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/norm.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/browser.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/computehttpmdcodebase.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/mercury.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/envcheck.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jini-ext.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/checkser.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/destroy.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jsk-lib.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/group.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/classserver.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/classdep.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/tools.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/mahalo.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/phoenix-group.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/checkconfigurationfile.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jsk-debug-policy.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/fiddler.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jsk-platform.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/computedigest.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jarwrapper.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jini-core.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/sun-util.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/extra.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/outrigger-snaplogstore.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/start.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/serviceui.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jsk-resources.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/reggie.jar
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/service/jini/master/ResourceBufferTask.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/service/jini/master/MappedTaskMaster.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/AbstractKeyRangeMasterTestCase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskIdleTimeout.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithErrors.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithSplits.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/AbstractMasterTestCase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithRedirect.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestFileSystemScanner.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTask.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/StressTestConcurrent.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/TestRangeQuery.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/relation/accesspath/TestBlockingBuffer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/relation/accesspath/TestBlockingBufferWithChunks.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/concurrent/FutureTaskMon.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/paths/ArbitraryLengthPathOp.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/proxy/ClientAsynchronousIterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/ClientIndexView.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/pipeline/AbstractMasterTask.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/pipeline/IndexWriteTask.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/AbstractScaleOutClientIndexView.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/rule/eval/ProgramTask.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/BlockingBuffer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/AccessPath.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/IBlockingBuffer.java
            A   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/ticket693.txt
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateTest2.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataConnectionTest.java
            A   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/property_paths.owl
            A   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/TestTicket693.java
            --- Merging r7213 through r7270 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
            A   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient2.java
            A   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager2.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient.java
            A   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll2.java
            --- Merging r7213 through r7270 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithoutSids.java
            --- Merging r7213 through r7270 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/IPreparedQuery.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/ConnectOptions.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryManager.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java
            --- Merging r7213 through r7270 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            A   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.srx
            A   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.ttl
            A   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.rq
            A   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-02.rq
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestOptionals.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTStaticJoinOptimizer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/store/TripleStoreUtility.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/PropertyPathNode.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/DGExpander.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteServiceCallImpl.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ArbitraryLengthPathNode.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/IReorderableNode.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/JoinGroupNode.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTStaticJoinOptimizer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTEmptyGroupOptimizer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTComplexOptionalOptimizer.java
            A   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/StaticOptimizer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/UnionNode.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StatementPatternNode.java
            Merge complete.
            ===== File Statistics: =====
            Added: 11
            Updated: 52
            ==== Conflict Statistics: =====
            File conflicts: 47
        

        All conflicts were resolved. Out of 47 conflicts, all but one were JAR conflicts. All of the JAR conflicts are edits that were backported to the 1.2.x maintenance branch from the READ_CACHE branch. The same jars are currently in both branches. To simplify things, I have accepted the existing jars in the READ_CACHE branch. In addition, there were some conflicts in AbstractHAJournalServerTestCase.java that arose from the recent changes in the 1.2.x branch to allow the caller to set the various HTTP header fields for the RemoteRepository. The HA test suite reuses the ConnectOpts class and parallel edits were made in AbstractHAJournalServerTestCase.java to support this.

        Committed revision r7271.

        Show
        bryanthompson bryanthompson added a comment - @ r7270. Merging r7213 through r7270 from branches/BIGDATA_RELEASE_1_2_0 into branches/BIGDATA_READ_CACHE merge --depth=infinity https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_2_0 /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE --- Merging r7213 through r7270 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/jsk-dl.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/outrigger-dl.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/fiddler-dl.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/phoenix-dl.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/norm-dl.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/group-dl.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/mahalo-dl.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/reggie-dl.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/browser-dl.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/sdm-dl.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-dl/mercury-dl.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib-ext/jsk-policy.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/preferredlistgen.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/outrigger.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/sharedvm.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/phoenix.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/phoenix-init.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/norm.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/browser.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/computehttpmdcodebase.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/mercury.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/envcheck.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jini-ext.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/checkser.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/destroy.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jsk-lib.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/group.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/classserver.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/classdep.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/tools.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/mahalo.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/phoenix-group.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/checkconfigurationfile.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jsk-debug-policy.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/fiddler.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jsk-platform.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/computedigest.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jarwrapper.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jini-core.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/sun-util.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/extra.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/outrigger-snaplogstore.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/start.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/serviceui.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/jsk-resources.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/lib/jini/lib/reggie.jar C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/service/jini/master/ResourceBufferTask.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/service/jini/master/MappedTaskMaster.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/AbstractKeyRangeMasterTestCase.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskIdleTimeout.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithErrors.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithSplits.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/AbstractMasterTestCase.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithRedirect.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestFileSystemScanner.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTask.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/StressTestConcurrent.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/service/TestRangeQuery.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/relation/accesspath/TestBlockingBuffer.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/relation/accesspath/TestBlockingBufferWithChunks.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/concurrent/FutureTaskMon.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/paths/ArbitraryLengthPathOp.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/proxy/ClientAsynchronousIterator.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/ClientIndexView.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/pipeline/AbstractMasterTask.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/pipeline/IndexWriteTask.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/AbstractScaleOutClientIndexView.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/rule/eval/ProgramTask.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/BlockingBuffer.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/AccessPath.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/IBlockingBuffer.java A /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/ticket693.txt U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateTest2.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataConnectionTest.java A /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/property_paths.owl A /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/TestTicket693.java --- Merging r7213 through r7270 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp A /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient2.java A /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager2.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient.java A /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll2.java --- Merging r7213 through r7270 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithoutSids.java --- Merging r7213 through r7270 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/IPreparedQuery.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/ConnectOptions.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryManager.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java --- Merging r7213 through r7270 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE A /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.srx A /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.ttl A /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.rq A /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-02.rq U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestOptionals.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTStaticJoinOptimizer.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/store/TripleStoreUtility.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/PropertyPathNode.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/DGExpander.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteServiceCallImpl.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ArbitraryLengthPathNode.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/IReorderableNode.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/JoinGroupNode.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTStaticJoinOptimizer.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTEmptyGroupOptimizer.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTComplexOptionalOptimizer.java A /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/StaticOptimizer.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/UnionNode.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StatementPatternNode.java Merge complete. ===== File Statistics: ===== Added: 11 Updated: 52 ==== Conflict Statistics: ===== File conflicts: 47 All conflicts were resolved. Out of 47 conflicts, all but one were JAR conflicts. All of the JAR conflicts are edits that were backported to the 1.2.x maintenance branch from the READ_CACHE branch. The same jars are currently in both branches. To simplify things, I have accepted the existing jars in the READ_CACHE branch. In addition, there were some conflicts in AbstractHAJournalServerTestCase.java that arose from the recent changes in the 1.2.x branch to allow the caller to set the various HTTP header fields for the RemoteRepository. The HA test suite reuses the ConnectOpts class and parallel edits were made in AbstractHAJournalServerTestCase.java to support this. Committed revision r7271.
        Hide
        bryanthompson bryanthompson added a comment -

        A correction to the above commit message. The target branch is branches/READ_CACHE, not branches/BIGDATA_READ_CACHE. There branches/BIGDATA_READ_CACHE branch does not exist.

        Show
        bryanthompson bryanthompson added a comment - A correction to the above commit message. The target branch is branches/READ_CACHE, not branches/BIGDATA_READ_CACHE. There branches/BIGDATA_READ_CACHE branch does not exist.
        Hide
        bryanthompson bryanthompson added a comment -

        @ r7271.

        merge --depth=infinity https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/READ_CACHE /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            C   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/service/jini/master/ResourceBufferTask.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/service/jini/master/MappedTaskMaster.java
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/disco
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/disco
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/attr
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/attr
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/util/config
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/util/config
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/lubm
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/lubm
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/uniprot/src
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/uniprot/src
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/uniprot
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/uniprot
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/btc/src/resources
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/btc/src/resources
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/btc
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/btc
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/src/resources/bin/config
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/src/resources/bin/config
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/lib/jetty
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/lib/jetty
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/bop/joinGraph
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/bop/joinGraph
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/bop/util
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/bop/util
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/jsr166
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/jsr166
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/AbstractKeyRangeMasterTestCase.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskIdleTimeout.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithErrors.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithSplits.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/AbstractMasterTestCase.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithRedirect.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestFileSystemScanner.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTask.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/StressTestConcurrent.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/TestRangeQuery.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/relation/accesspath/TestBlockingBuffer.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/relation/accesspath/TestBlockingBufferWithChunks.java
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/util/httpd
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/util/httpd
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/concurrent/FutureTaskMon.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/paths/ArbitraryLengthPathOp.java
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/aggregate
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/aggregate
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/util
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/util
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/joinGraph
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/joinGraph
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/jsr166
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/jsr166
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/service/proxy/ClientAsynchronousIterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/service/ndx/ClientIndexView.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/service/ndx/pipeline/AbstractMasterTask.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/service/ndx/pipeline/IndexWriteTask.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/service/ndx/AbstractScaleOutClientIndexView.java
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/htree/raba
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/htree/raba
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/relation/rule/eval/ProgramTask.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/relation/accesspath/BlockingBuffer.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/relation/accesspath/AccessPath.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/relation/accesspath/IBlockingBuffer.java
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/osgi
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/osgi
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-compatibility
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-compatibility
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/ticket693.txt
            C   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateTest2.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataConnectionTest.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/property_paths.owl
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestTicket693.java
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/bench
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/bench
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient2.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager2.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll2.java
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithoutSids.java
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/IPreparedQuery.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/ConnectOptions.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryManager.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.srx
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.ttl
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.rq
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-02.rq
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestOptionals.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTStaticJoinOptimizer.java
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/internal
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/internal
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/relation
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/relation
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/error
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/error
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/store/TripleStoreUtility.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/PropertyPathNode.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/DGExpander.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteServiceCallImpl.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ArbitraryLengthPathNode.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/IReorderableNode.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/JoinGroupNode.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTStaticJoinOptimizer.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTEmptyGroupOptimizer.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTComplexOptionalOptimizer.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/StaticOptimizer.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/UnionNode.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StatementPatternNode.java
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/internal
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/internal
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/relation
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/relation
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/util
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/util
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/samples
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/samples
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/LEGAL
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/LEGAL
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/lib
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/lib
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/test/it/unimi/dsi
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/test/it/unimi/dsi
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/test/it/unimi
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/test/it/unimi
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/test
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/test
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/java/it/unimi
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/java/it/unimi
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/java/it
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/java/it
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/java
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/java
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils
             U  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils
            --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
             C  /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            Merge complete.
            ===== File Statistics: =====
            Added: 11
            Updated: 51
            ==== Property Statistics: =====
            Updated: 49
            ==== Conflict Statistics: =====
            File conflicts: 2
            Property conflicts: 1
        

        The conflicts were resolved as follows:


        - AbstractHAJournalServerTestCase: the changes to support the setting of HTTP headers on the ConnectOpts class were accepted. The current version of the class was used otherwise.


        - BigdataSPARQLUpdateTest2: resolved using the incoming version. This was a change backported from branches/READ_CACHE into the 1.2.x maintenance branch.


        - A properties conflict existed on the top-level directory of the project in SVN for the "ant-build" property. I have discarded that update. Hopefully we will pick up the update when we merge READ_CACHE2 back to READ_CACHE.

        Committed revision r7272.

        Show
        bryanthompson bryanthompson added a comment - @ r7271. merge --depth=infinity https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/READ_CACHE /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH C /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/service/jini/master/ResourceBufferTask.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/service/jini/master/MappedTaskMaster.java --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/disco U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/disco --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/attr U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/attr --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/util/config U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-jini/src/java/com/bigdata/util/config --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/lubm U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/lubm --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/uniprot/src U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/uniprot/src --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/uniprot U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/uniprot --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/btc/src/resources U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/btc/src/resources --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/btc U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/btc --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/src/resources/bin/config U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/src/resources/bin/config --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/lib/jetty U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/lib/jetty --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/bop/joinGraph U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/bop/joinGraph --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/bop/util U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/bop/util --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/jsr166 U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/jsr166 --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/AbstractKeyRangeMasterTestCase.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskIdleTimeout.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithErrors.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithSplits.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/AbstractMasterTestCase.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTaskWithRedirect.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestFileSystemScanner.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/ndx/pipeline/TestMasterTask.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/StressTestConcurrent.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/service/TestRangeQuery.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/relation/accesspath/TestBlockingBuffer.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/relation/accesspath/TestBlockingBufferWithChunks.java --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/util/httpd U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/util/httpd --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/concurrent/FutureTaskMon.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/paths/ArbitraryLengthPathOp.java --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/aggregate U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/aggregate --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/util U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/util --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/joinGraph U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/joinGraph --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/jsr166 U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/jsr166 --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/service/proxy/ClientAsynchronousIterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/service/ndx/ClientIndexView.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/service/ndx/pipeline/AbstractMasterTask.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/service/ndx/pipeline/IndexWriteTask.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/service/ndx/AbstractScaleOutClientIndexView.java --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/htree/raba U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/htree/raba --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/relation/rule/eval/ProgramTask.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/relation/accesspath/BlockingBuffer.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/relation/accesspath/AccessPath.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/relation/accesspath/IBlockingBuffer.java --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/osgi U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/osgi --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-compatibility U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-compatibility --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/ticket693.txt C /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataSPARQLUpdateTest2.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/tck/BigdataConnectionTest.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/property_paths.owl A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestTicket693.java --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/bench U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/bench --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient2.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager2.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll2.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/TestBigdataSailWithoutSids.java --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/bench --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/IPreparedQuery.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/ConnectOptions.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepositoryManager.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.srx A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.ttl A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.rq A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-02.rq U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestOptionals.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTStaticJoinOptimizer.java --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/internal U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/internal --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/relation U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/relation --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/changesets --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/error U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/error --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/store/TripleStoreUtility.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/PropertyPathNode.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/DGExpander.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/service/RemoteServiceCallImpl.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ArbitraryLengthPathNode.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/IReorderableNode.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/JoinGroupNode.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTStaticJoinOptimizer.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTEmptyGroupOptimizer.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTComplexOptionalOptimizer.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/StaticOptimizer.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/UnionNode.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/StatementPatternNode.java --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/internal U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/internal --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/relation U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/relation --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/util U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/util --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/samples U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/samples --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/LEGAL U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/LEGAL --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/lib U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/lib --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/test/it/unimi/dsi U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/test/it/unimi/dsi --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/test/it/unimi U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/test/it/unimi --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/test U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/test --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/java/it/unimi U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/java/it/unimi --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/java/it U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/java/it --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src/java --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils/src --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/dsi-utils --- Merging r7214 through r7271 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH C /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH Merge complete. ===== File Statistics: ===== Added: 11 Updated: 51 ==== Property Statistics: ===== Updated: 49 ==== Conflict Statistics: ===== File conflicts: 2 Property conflicts: 1 The conflicts were resolved as follows: - AbstractHAJournalServerTestCase: the changes to support the setting of HTTP headers on the ConnectOpts class were accepted. The current version of the class was used otherwise. - BigdataSPARQLUpdateTest2: resolved using the incoming version. This was a change backported from branches/READ_CACHE into the 1.2.x maintenance branch. - A properties conflict existed on the top-level directory of the project in SVN for the "ant-build" property. I have discarded that update. Hopefully we will pick up the update when we merge READ_CACHE2 back to READ_CACHE. Committed revision r7272.
        Hide
        bryanthompson bryanthompson added a comment -

        Merging changes from branches/READ_CACHE2 back into branches/READ_CACHE. These changes are designed to improve the stability and failover characteristics of the HA replication cluster. Work continues on this under branches/READ_CACHE2.

        @ r7291.

        merge https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/READ_CACHE2 /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/StressTestHA3JournalServer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServerOverride.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3JournalServerTestCase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-A.properties
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-B.properties
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournalTest.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-C.properties
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-A.config
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-B.config
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-C.config
            C   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA2JournalServer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3JournalServer.java
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/disco
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/disco
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/jini/start/config/ServiceConfiguration.java
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/attr
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/attr
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/SnapshotManager.java
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/util/config
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/util/config
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/lubm
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/lubm
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/uniprot/src
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/uniprot/src
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/uniprot
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/uniprot
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/btc/src/resources
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/btc/src/resources
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/btc
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/btc
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/src/resources/bin/config
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/src/resources/bin/config
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/lib/jetty
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/lib/jetty
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/bop/joinGraph
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/bop/joinGraph
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/bop/util
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/bop/util
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/quorum/TestSingletonQuorumSemantics.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive3Nodes.java
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/jsr166
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/jsr166
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/rwstore/TestRWJournal.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/journal/ha/AbstractHAJournalTestCase.java
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/util/httpd
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/util/httpd
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/quorum/QuorumStateChangeListener.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java
            A   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/quorum/QuorumTokenTransitions.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/QuorumPipelineImpl.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/QuorumServiceBase.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/msg/HANotifyReleaseTimeRequest.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/msg/IHAGatherReleaseTimeRequest.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/msg/IHA2PhasePrepareMessage.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/msg/HAGatherReleaseTimeRequest.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/msg/HA2PhasePrepareMessage.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/msg/IHANotifyReleaseTimeRequest.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/QuorumService.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/halog/IHALogWriter.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/halog/HALogWriter.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/pipeline/HASendService.java
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/aggregate
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/aggregate
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/util
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/util
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/joinGraph
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/joinGraph
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/jsr166
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/jsr166
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/AbstractHATransactionService.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/proxy/ClientAsynchronousIterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/ClientIndexView.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/pipeline/AbstractMasterTask.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/pipeline/IndexWriteTask.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/AbstractScaleOutClientIndexView.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/io/FileChannelUtility.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/BufferedWrite.java
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/htree/raba
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/htree/raba
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/journal/Journal.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/rule/eval/ProgramTask.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/BlockingBuffer.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/AccessPath.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/IBlockingBuffer.java
            A   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/util/StackInfoReport.java
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/build.xml
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/osgi
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/osgi
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-compatibility
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-compatibility
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
              C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/ticket693.txt
              C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/property_paths.owl
              C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/TestTicket693.java
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/bench
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/bench
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
              C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient2.java
              C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager2.java
              C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll2.java
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/bench
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/bench
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/HAStatusServletUtil.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/IPreparedQuery.java
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
              C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.srx
              C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.ttl
              C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.rq
              C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-02.rq
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestOptionals.java
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/internal
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/internal
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/relation
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/relation
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/changesets
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/changesets
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/error
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/error
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/store/TripleStoreUtility.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java
            U   /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/DGExpander.java
              C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/StaticOptimizer.java
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/internal
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/internal
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/relation
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/relation
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/util
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/util
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/samples
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/samples
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/LEGAL
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/LEGAL
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/lib
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/lib
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/test/it/unimi/dsi
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/test/it/unimi/dsi
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/test/it/unimi
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/test/it/unimi
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/test
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/test
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/java/it/unimi
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/java/it/unimi
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/java/it
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/java/it
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/java
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/java
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils
            --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
             G  /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE
            Merge complete.
            ===== File Statistics: =====
            Added: 2
            Updated: 59
            ==== Property Statistics: =====
            Merged: 50
            ==== Conflict Statistics: =====
            File conflicts: 1
            Tree conflicts: 11
        

        The one file conflict reported in the summary had identical changes in both branches (AbstractHAJournalServerTestCase).

        There were a number of file conflicts NOT reported in the summary. These all had no changes when comparing the two files. I do not know why the conflict was reported.

        See BLZG-642 (Journal HA)
        See BLZG-811 (HA3 simultaneous start failures)

        Committed Revision r7292.

        Show
        bryanthompson bryanthompson added a comment - Merging changes from branches/READ_CACHE2 back into branches/READ_CACHE. These changes are designed to improve the stability and failover characteristics of the HA replication cluster. Work continues on this under branches/READ_CACHE2. @ r7291. merge https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/READ_CACHE2 /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/StressTestHA3JournalServer.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServerOverride.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3JournalServerTestCase.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-A.properties U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-B.properties U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournalTest.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-C.properties U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-A.config U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-B.config U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-C.config C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA2JournalServer.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3JournalServer.java --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/disco G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/disco --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/jini/start/config/ServiceConfiguration.java --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/attr G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/attr --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/journal/jini/ha/SnapshotManager.java --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/util/config G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-jini/src/java/com/bigdata/util/config --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/lubm G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/lubm --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/uniprot/src G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/uniprot/src --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/uniprot G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/uniprot --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/btc/src/resources G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/btc/src/resources --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/btc G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf/btc --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-perf --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/src/resources/bin/config G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/src/resources/bin/config --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/lib/jetty G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/lib/jetty --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/bop/joinGraph G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/bop/joinGraph --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/bop/util G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/bop/util --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/quorum/TestSingletonQuorumSemantics.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive3Nodes.java --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/jsr166 G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/jsr166 --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/rwstore/TestRWJournal.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/journal/ha/AbstractHAJournalTestCase.java --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/util/httpd G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/test/com/bigdata/util/httpd --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/quorum/QuorumStateChangeListener.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java A /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/quorum/QuorumTokenTransitions.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/QuorumPipelineImpl.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/QuorumServiceBase.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/msg/HANotifyReleaseTimeRequest.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/msg/IHAGatherReleaseTimeRequest.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/msg/IHA2PhasePrepareMessage.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/msg/HAGatherReleaseTimeRequest.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/msg/HA2PhasePrepareMessage.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/msg/IHANotifyReleaseTimeRequest.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/QuorumService.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/halog/IHALogWriter.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/halog/HALogWriter.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/ha/pipeline/HASendService.java --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/aggregate G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/aggregate --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/util G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/util --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/joinGraph G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/bop/joinGraph --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/jsr166 G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/jsr166 --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/AbstractHATransactionService.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/proxy/ClientAsynchronousIterator.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/ClientIndexView.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/pipeline/AbstractMasterTask.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/pipeline/IndexWriteTask.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/service/ndx/AbstractScaleOutClientIndexView.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/io/FileChannelUtility.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/io/writecache/BufferedWrite.java --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/htree/raba G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/htree/raba --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/journal/Journal.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/journal/AbstractJournal.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/rule/eval/ProgramTask.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/BlockingBuffer.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/AccessPath.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/relation/accesspath/IBlockingBuffer.java A /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata/src/java/com/bigdata/util/StackInfoReport.java --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/build.xml --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/osgi G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/osgi --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-compatibility G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-compatibility --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/ticket693.txt C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/property_paths.owl C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/TestTicket693.java --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/bench G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/bench --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient2.java C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager2.java C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll2.java G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/bench G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/bench --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/HAStatusServletUtil.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/IPreparedQuery.java G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.srx C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.ttl C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-01.rq C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/non-matching-optional-02.rq U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestOptionals.java --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/internal G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/internal --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/relation G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/test/com/bigdata/rdf/relation --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/changesets G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/changesets --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/error G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/error --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/store/TripleStoreUtility.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java U /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/DGExpander.java C /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/StaticOptimizer.java --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/internal G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/internal --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/relation G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/relation --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/util G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/java/com/bigdata/rdf/util --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/samples G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/bigdata-rdf/src/samples --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/LEGAL G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/LEGAL --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/lib G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/lib --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/test/it/unimi/dsi G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/test/it/unimi/dsi --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/test/it/unimi G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/test/it/unimi --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/test G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/test --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/java/it/unimi G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/java/it/unimi --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/java/it G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/java/it --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/java G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src/java --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils/src --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE/dsi-utils --- Merging r7214 through r7291 into /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE G /Users/bryan/Documents/workspace/BIGDATA_READ_CACHE Merge complete. ===== File Statistics: ===== Added: 2 Updated: 59 ==== Property Statistics: ===== Merged: 50 ==== Conflict Statistics: ===== File conflicts: 1 Tree conflicts: 11 The one file conflict reported in the summary had identical changes in both branches (AbstractHAJournalServerTestCase). There were a number of file conflicts NOT reported in the summary. These all had no changes when comparing the two files. I do not know why the conflict was reported. See BLZG-642 (Journal HA) See BLZG-811 (HA3 simultaneous start failures) Committed Revision r7292.
        Hide
        bryanthompson bryanthompson added a comment -

        Merge 1.2.x development branch (branches/BIGDATA_RELEASE_1_2_0) into the HA development branch (brancehs/READ_CACHE2).

        No conflicts.

        Committed revision r7381.

        SVN Transcript follows:

            At revision 7380.
        merge https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_2_0 /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas/RWStore.properties
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas/build.properties
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas/log4j.properties
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas/README.txt
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas/Makefile
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas/build.xml
            --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/build.properties
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/striterator/TestAll.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/striterator/TestAppendFilter.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/striterator/MergeFilter.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/striterator/Striterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/striterator/IStriterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/striterator/Appender.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/striterator/ChunkedStriterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/bset/ConditionalRoutingOp.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/journal/QueueStatsPlugIn.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/relation/accesspath/ElementFilter.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-ganglia/LEGAL/junit-license.html
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-ganglia/LEGAL/log4j-license.txt
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/build.xml
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/.classpath
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/NOTICE
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/LEGAL
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/LEGAL/sesame2.x-license.txt
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/LEGAL/junit-license.html
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/LEGAL/apache-license-2_0.txt
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/LEGAL/log4j-license.txt
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/lib
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/lib/openrdf-sesame-2.6.10-onejar.jar
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/lib/junit-3.8.1.jar
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/lib/log4j-1.2.15.jar
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/AbstractGraphTestCase.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/impl
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/impl/sail
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/impl/sail/TestAll.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/impl/sail/AbstractSailGraphTestCase.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/impl/sail/TestGather.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/analytics
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/analytics/TestAll.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/analytics/TestSSSP.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/analytics/TestBFS.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/TestAll.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/data
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/data/smallGraph.ttl
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASOptions.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASStats.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IReducer.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASSchedulerImpl.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/Factory.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/SSSP.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/BFS.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/package.html
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASEngine.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IStaticFrontier.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASProgram.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/EdgesEnum.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/package.html
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/GASContext.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/GASEngine.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/VertexTaskFactory.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/frontier
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/frontier/StaticFrontier2.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/sail
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/sail/SailGraphFixture.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/sail/SAILGASEngine.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/sail/package.html
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/GASStats.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/GASState.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/BaseGASProgram.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/IManagedIntArray.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/IIntArraySlice.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/IManagedArray.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/ManagedIntArray.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/IArraySlice.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/GASImplUtil.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/ManagedArray.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/VertexDistribution.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/package.html
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/scheduler
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/scheduler/TLScheduler2.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/scheduler/STScheduler.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/scheduler/CHMScheduler.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/scheduler/TLScheduler.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASScheduler.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASState.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASContext.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGraphAccessor.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/util
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/util/IGraphFixture.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/util/GASUtil.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/util/IGraphFixtureFactory.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/util/AbstractGraphFixture.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/resources
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/build.properties
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/build.xml
            --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient2.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/AbstractProtocolTest.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll2.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/ProxySuiteHelper.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/AbstractSimpleInsertTest.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager2.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestConneg.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestPostNotURLEncoded.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAskJsonTrac704.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/ExampleProtocolTest.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/AbstractIndexManagerTestCase.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestCBD731.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestInsertFilterFalse727.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestRelease123Protocol.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestProtocolAll.java
            --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/ConnegUtil.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RESTServlet.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/MiniMime.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/BackgroundTupleResult.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java
            --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/TestAll.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/bd
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/bd/TestAll.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/bd/TestSSSP.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/bd/TestBFS.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/bd/TestGather.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/bd/AbstractBigdataGraphTestCase.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/sail
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/analytics
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/filter-exist-725-sub-select.rq
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestSubSelectFilterExist725.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429empty.trig
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709empty.rq
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709.rq
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709.srx
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestGraphEmptyPattern709_429.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/heisenbug-708.srx
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429empty.srx
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709workaround.rq
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/filter-exist-725.srx
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429.trig
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/heisenbug-708.rq
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/heisenbug-708.ttl
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/filter-exist-725.ttl
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429neg.srx
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/heisenbug-708-doubleBind.rq
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709empty.trig
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429neg.trig
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429neg.rq
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/heisenbug-708-doubleBind.srx
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709.trig
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709empty.srx
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/heisenbug-708-doubleBind.ttl
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestBindHeisenbug708.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429.rq
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/filter-exist-725-no-sub-select.rq
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429.srx
            --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/internal
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestEncodeDecodeKeys.java
            --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/rio/nquads/NQuadsParser.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataBindingSetResolverator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPO.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/ISPO.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/MergeSortIterator.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGraphFixture.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/GASRunner.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASState.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASEngine.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/util
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/mem
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/mem/package.html
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/scheduler
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/analytics
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SliceServiceFactory.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpContext.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SearchInSearchServiceFactory.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/AbstractJoinGroupOptimizer.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTRangeOptimizer.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GroupNodeBase.java
            --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/internal
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/IV.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/BindingConstraint.java
            --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/test/cutthecrap/utils/striterators/TestFilterBase.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/test/cutthecrap/utils/striterators/TestFilter.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/test/cutthecrap/utils/striterators/TestAll.java
            A   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/test/cutthecrap/utils/striterators/TestArrayIterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/test/cutthecrap/utils/striterators/TestCloseable.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IXPropertyIterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Prefetch.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/NOPFilter.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IContextMgr.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/UniquenessFilter.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IPropertySet.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Mapperator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Filterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/EnumIterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/ExclusionFilter.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/FilterBase.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Striterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Mapper.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Appenderator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Filter.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Visitorator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Resolverator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/ArrayIterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IStriterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Expanderator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Appender.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Visitor.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Resolver.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Contractorator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Sorterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Expander.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Mergerator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/EmptyIterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/XProperty.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Contractor.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Sorter.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Merger.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IXProperty.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/XPropertyIterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/ReadOnlyIterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/SingleValueIterator.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IFilter.java
            U   /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IFilterTest.java
            Merge complete.
            ===== File Statistics: =====
            Added: 161
            Updated: 86
        
        Show
        bryanthompson bryanthompson added a comment - Merge 1.2.x development branch (branches/BIGDATA_RELEASE_1_2_0) into the HA development branch (brancehs/READ_CACHE2). No conflicts. Committed revision r7381. SVN Transcript follows: At revision 7380. merge https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/BIGDATA_RELEASE_1_2_0 /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas/RWStore.properties A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas/build.properties A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas/log4j.properties A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas/README.txt A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas/Makefile A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-perf/gas/build.xml --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/build.properties U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/striterator/TestAll.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/test/com/bigdata/striterator/TestAppendFilter.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/striterator/MergeFilter.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/striterator/Striterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/striterator/IStriterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/striterator/Appender.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/striterator/ChunkedStriterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/bop/bset/ConditionalRoutingOp.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/journal/QueueStatsPlugIn.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata/src/java/com/bigdata/relation/accesspath/ElementFilter.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-ganglia/LEGAL/junit-license.html A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-ganglia/LEGAL/log4j-license.txt U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/build.xml U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/.classpath A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/NOTICE A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/LEGAL A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/LEGAL/sesame2.x-license.txt A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/LEGAL/junit-license.html A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/LEGAL/apache-license-2_0.txt A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/LEGAL/log4j-license.txt A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/lib A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/lib/openrdf-sesame-2.6.10-onejar.jar A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/lib/junit-3.8.1.jar A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/lib/log4j-1.2.15.jar A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/AbstractGraphTestCase.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/impl A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/impl/sail A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/impl/sail/TestAll.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/impl/sail/AbstractSailGraphTestCase.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/impl/sail/TestGather.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/analytics A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/analytics/TestAll.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/analytics/TestSSSP.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/analytics/TestBFS.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/TestAll.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/data A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/test/com/bigdata/rdf/graph/data/smallGraph.ttl A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASOptions.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASStats.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IReducer.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASSchedulerImpl.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/Factory.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/SSSP.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/BFS.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/analytics/package.html A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASEngine.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IStaticFrontier.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASProgram.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/EdgesEnum.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/package.html A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/GASContext.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/GASEngine.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/VertexTaskFactory.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/frontier A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/frontier/StaticFrontier2.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/sail A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/sail/SailGraphFixture.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/sail/SAILGASEngine.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/sail/package.html A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/GASStats.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/GASState.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/BaseGASProgram.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/IManagedIntArray.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/IIntArraySlice.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/IManagedArray.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/ManagedIntArray.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/IArraySlice.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/GASImplUtil.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/ManagedArray.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/util/VertexDistribution.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/package.html A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/scheduler A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/scheduler/TLScheduler2.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/scheduler/STScheduler.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/scheduler/CHMScheduler.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/impl/scheduler/TLScheduler.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASScheduler.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASState.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGASContext.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/IGraphAccessor.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/util A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/util/IGraphFixture.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/util/GASUtil.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/util/IGraphFixtureFactory.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/java/com/bigdata/rdf/graph/util/AbstractGraphFixture.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/src/resources A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/build.properties A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-gas/build.xml --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient2.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlClient.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/AbstractProtocolTest.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAll2.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/ProxySuiteHelper.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/AbstractSimpleInsertTest.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestNanoSparqlServerWithProxyIndexManager2.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestConneg.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestPostNotURLEncoded.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestAskJsonTrac704.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/ExampleProtocolTest.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/AbstractIndexManagerTestCase.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestCBD731.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestInsertFilterFalse727.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestRelease123Protocol.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestProtocolAll.java --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/ConnegUtil.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/QueryServlet.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/RESTServlet.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFServlet.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/BigdataRDFContext.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/MiniMime.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/BackgroundTupleResult.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/client/RemoteRepository.java --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/TestAll.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/bd A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/bd/TestAll.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/bd/TestSSSP.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/bd/TestBFS.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/bd/TestGather.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/bd/AbstractBigdataGraphTestCase.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/impl/sail A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/graph/analytics A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/filter-exist-725-sub-select.rq A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestSubSelectFilterExist725.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429empty.trig A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709empty.rq A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709.rq A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709.srx A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestGraphEmptyPattern709_429.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/heisenbug-708.srx A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429empty.srx A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709workaround.rq A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/filter-exist-725.srx A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429.trig A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/heisenbug-708.rq A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/heisenbug-708.ttl A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/filter-exist-725.ttl A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429neg.srx A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/heisenbug-708-doubleBind.rq A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709empty.trig A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429neg.trig A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429neg.rq A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/heisenbug-708-doubleBind.srx A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709.trig A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac709empty.srx A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/heisenbug-708-doubleBind.ttl A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestBindHeisenbug708.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429.rq A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/filter-exist-725-no-sub-select.rq A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/trac429.srx --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/internal U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/test/com/bigdata/rdf/internal/TestEncodeDecodeKeys.java --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/rio/nquads/NQuadsParser.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/store/AbstractTripleStore.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/store/BigdataBindingSetResolverator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/SPO.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/spo/ISPO.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/MergeSortIterator.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGraphFixture.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/GASRunner.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASState.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/bd/BigdataGASEngine.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/util A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/mem A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/mem/package.html A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/impl/scheduler A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/graph/analytics U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/ASTEvalHelper.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SliceServiceFactory.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpContext.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/SearchInSearchServiceFactory.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpUtility.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/AbstractJoinGroupOptimizer.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTRangeOptimizer.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GroupNodeBase.java --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/internal U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/IV.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/bigdata-rdf/src/java/com/bigdata/rdf/internal/constraints/BindingConstraint.java --- Merging r7270 through r7380 into /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/test/cutthecrap/utils/striterators/TestFilterBase.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/test/cutthecrap/utils/striterators/TestFilter.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/test/cutthecrap/utils/striterators/TestAll.java A /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/test/cutthecrap/utils/striterators/TestArrayIterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/test/cutthecrap/utils/striterators/TestCloseable.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IXPropertyIterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Prefetch.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/NOPFilter.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IContextMgr.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/UniquenessFilter.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IPropertySet.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Mapperator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Filterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/EnumIterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/ExclusionFilter.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/FilterBase.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Striterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Mapper.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Appenderator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Filter.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Visitorator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Resolverator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/ArrayIterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IStriterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Expanderator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Appender.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Visitor.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Resolver.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Contractorator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Sorterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Expander.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Mergerator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/EmptyIterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/XProperty.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Contractor.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Sorter.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Merger.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IXProperty.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/XPropertyIterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/ReadOnlyIterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/SingleValueIterator.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IFilter.java U /Users/bryan/Documents/workspace/READ_CACHE_CLEAN_FOR_PATCH/ctc-striterators/src/java/cutthecrap/utils/striterators/IFilterTest.java Merge complete. ===== File Statistics: ===== Added: 161 Updated: 86

          People

          • Assignee:
            bryanthompson bryanthompson
            Reporter:
            bryanthompson bryanthompson
          • Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved: