[Bigdata-commit] SF.net SVN: bigdata:[7753] branches/BIGDATA_RELEASE_1_3_0

[<tho...@us...>]

Revision: 7753
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7753&view=rev
Author:   thompsonbry
Date:     2014-01-09 19:24:27 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
This issue is closed.  

Branch MGC_1_3_0 was created from r7608 of branches/BIGDATA_RELEASE_1_3_0.  

This branch was used to make HA robust in the face of sudden process kills.

Merging MGC_1_3_0 back to the main development branch (branches/BIGDATA_RELEASE_1_3_0).  Work on MGC_1_3_0 is closed out.
{{{
merge -r7608:HEAD https://bigdata.svn.sourceforge.net/svnroot/bigdata/branches/MGC_1_3_0 /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/test/com/bigdata/quorum/zk/MockQuorumMember.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestAll.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3JournalServerTestCase.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournalTest.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServer.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3JustKills.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/disco
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/disco
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/quorum/zk/ZKQuorumImpl.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/attr
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/attr
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/util/config
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-jini/src/java/com/bigdata/util/config
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/lubm
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/lubm
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/uniprot/src
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/uniprot/src
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/uniprot
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/uniprot
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/btc/src/resources
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/btc/src/resources
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/btc
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf/btc
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-perf
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/src/resources/bin/config
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/src/resources/bin/config
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/build.properties
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/build.xml
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-compatibility
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-compatibility
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/LEGAL
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/LEGAL
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/lib
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/lib
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/test/it/unimi/dsi
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/test/it/unimi/dsi
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/test/it/unimi
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/test/it/unimi
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/test
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/test
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/java/it/unimi
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/java/it/unimi
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/java/it
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/java/it
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/java
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src/java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils/src
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/dsi-utils
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-war/src/html/index.html
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/lib/jetty
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/lib/jetty
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/joinGraph
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJoinGraph.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestAll.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/joinGraph/rto/TestJGraph.java
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/joinGraph
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/TestAll.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/join/TestPipelineJoin.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/join/AbstractHashJoinUtilityTestCase.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/util
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/bop/util
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/striterator/TestCloseableChunkedIteratorWrapperConverter.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/quorum/MockQuorumFixture.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/TestAll.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive3Nodes.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/ha/pipeline/TestSocketsDirect.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/ha/pipeline/AbstractHASendAndReceiveTestCase.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/ha/msg/TestHASendState.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/ha/msg/TestAll.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/jsr166
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/jsr166
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/ha/HABranch.txt
    D   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/ha/TestHAWORMStrategy.java
    D   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/ha/AbstractHAJournalTestCase.java
    D   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/ha/TestJournalHA.java
    D   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/ha/TestAll.java
    D   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/ha/TestHAWritePipeline.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/journal/TestWORMStrategyNoCache.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/util/httpd
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/test/com/bigdata/util/httpd
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/IChunkedIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/CloseableIteratorWrapper.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/MergeFilter.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/AbstractChunkedResolverator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/ChunkedWrappedIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/Striterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/ChunkedResolvingIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/IChunkedStriterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/Resolver.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/PushbackIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/GenericChunkedStriterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/Chunkerator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/DelegateChunkedIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/ChunkedOrderedStriterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/ChunkedArrayIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/ChunkedConvertingIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/Dechunkerator.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/striterator/CloseableChunkedIteratorWrapperConverter.java
    C   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java
    C   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/quorum/QuorumActor.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/quorum/QuorumClient.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/quorum/ServiceLookup.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/QuorumPipelineImpl.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/HAPipelineResetResponse.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/IHAPipelineResetRequest.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/IHAPipelineResetResponse.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/QuorumPipeline.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/PipelineDownstreamChange.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/PipelineImmediateDownstreamReplicationException.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/HASendService.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/NestedPipelineException.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/AbstractPipelineException.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/ImmediateDownstreamReplicationException.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/HAReceiveService.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/PipelineUpstreamChange.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/pipeline/AbstractPipelineChangeException.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/HAPipelineResetRequest.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/HAPipelineGlue.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/QuorumServiceBase.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/msg/HAWriteMessageBase.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/msg/IHASendState.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/msg/HAWriteMessage.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/msg/HASendState.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/msg/IHAMessageWrapper.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/msg/HAMessageWrapper.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/QuorumCommitImpl.java
    A   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/ha/AbstractMessageTask.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/AbstractAccessPathOp.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/solutions/DropOp.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/solutions/ProjectionOp.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/solutions/GroupByRewriter.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/solutions/GroupByState.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/solutions/SliceOp.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/CoreBaseBOp.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/aggregate
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/aggregate
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/engine/BOpStats.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/engine/RunState.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/engine/ChunkedRunningQuery.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/engine/AbstractRunningQuery.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/engine/QueryEngine.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/util
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/util
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/joinGraph
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/joinGraph/rto/JoinGraph.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/joinGraph/rto/PathIds.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/joinGraph/rto/SampleBase.java
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/joinGraph
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/controller/INamedSubqueryOp.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/BOpBase.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/fed/ThickChunkMessage.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/fed/NIOChunkMessage.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/fed/EmptyChunkMessage.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/IHashJoinUtility.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/HashJoinOp.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/JVMHashJoinUtility.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/BaseJoinStats.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/NamedSolutionSetStats.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/PipelineJoin.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/join/JoinVariableNotBoundException.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/BOpUtility.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/bop/SimpleIdFactory.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/jsr166
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/jsr166
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/btree/data/DefaultNodeCoder.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/btree/data/DefaultLeafCoder.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/htree/raba
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/htree/raba
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/journal/Options.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/journal/Name2Addr.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/relation/accesspath/AccessPath.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/relation/accesspath/MultiSourceSequentialCloseableIterator.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/relation/accesspath/IBindingSetAccessPath.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/util/NT.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/resources/deployment
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/lgpl-utils/src/test/it/unimi/dsi/fastutil/bytes/custom
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/lgpl-utils/src/java/it/unimi/dsi/fastutil/bytes/custom
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/osgi
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/osgi
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/test/com/bigdata/rdf/sail/bench
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/test/com/bigdata/rdf/sail/bench
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp/TestService794.java
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/test/com/bigdata/rdf/sail/webapp
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/java/com/bigdata/rdf/sail/bench
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/java/com/bigdata/rdf/sail/bench
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-sails/src/java/com/bigdata/rdf/sail/changesets
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/bop/rdf/aggregate
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/rto
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/eval/TestQueryHints.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/sparql/ast/optimizers/TestASTMassagedServiceNodeOptimizer.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/internal
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/internal
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/relation
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/test/com/bigdata/rdf/relation
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/bop/rdf/update/ParserStats.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/bop/rdf/aggregate
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/changesets
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/changesets
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/error
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/error
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/store/DataLoader.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/IQueryHint.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTONEdgesQueryHint.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/AbstractChunkSizeHint.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTOLimitQueryHint.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/QueryHintRegistry.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/hints/RTOSampleTypeQueryHint.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/GraphPatternGroup.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/NamedSubqueryInclude.java
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpRTO.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpFilters.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpBase.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/eval/AST2BOpJoins.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryHints.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ASTBase.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/optimizers/ASTBindingAssigner.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/ValueExpressionListBaseNode.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/SliceNode.java
    U   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/sparql/ast/QueryOptimizerEnum.java
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/internal
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/internal
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/relation
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/relation
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/util
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/java/com/bigdata/rdf/util
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/samples
     U  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/samples
    --- Merging r7608 through r7752 into /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
      C /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata-rdf/src/resources/data/lehigh/LUBM-U1.rdf.gz
     C  /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN
    Merge complete.
    ===== File Statistics: =====
    Deleted: 5
    Added: 19
    Updated: 108
    ==== Property Statistics: =====
    Updated: 49
    ==== Conflict Statistics: =====
    File conflicts: 2
    Property conflicts: 1
    Tree conflicts: 13
}}}

There were TWO files with conflicts. In both cases, the incoming
version was accepted. Those files are:
{{{
    C   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java
    C   /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0_CLEAN/bigdata/src/java/com/bigdata/quorum/QuorumActor.java
}}}

There was also an SVN property conflict on svn:ignore.  This was resolved by using the version from the main branch.

I also needed to go into the tree conflict view and "mark resolved" a number of files. Each of this was reported as "local add" and "incoming and upon merge". In all cases these were simply recently added files from the main branch. 

See #779 (pipeline resynchronization protocol)
See #724 (HA wire pulls and sure kill tests)

Revision Links:
--------------
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7608&view=rev
    http://bigdata.svn.sourceforge.net/bigdata/?rev=7752&view=rev

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/HAPipelineGlue.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/QuorumCommitImpl.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/QuorumPipeline.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/QuorumPipelineImpl.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/QuorumServiceBase.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/msg/HAWriteMessage.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/msg/HAWriteMessageBase.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/pipeline/HAReceiveService.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/pipeline/HASendService.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/pipeline/PipelineDownstreamChange.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/pipeline/PipelineUpstreamChange.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/quorum/AbstractQuorum.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/quorum/QuorumActor.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/quorum/QuorumClient.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/TestAll.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/ha/msg/TestAll.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/ha/pipeline/TestHASendAndReceive3Nodes.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/journal/TestWORMStrategyNoCache.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/journal/ha/HABranch.txt
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/quorum/MockQuorumFixture.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/AbstractServer.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournal.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3JournalServerTestCase.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournalTest.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestAll.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServer.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/quorum/zk/MockQuorumMember.java
    branches/BIGDATA_RELEASE_1_3_0/build.xml

Added Paths:
-----------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/AbstractMessageTask.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/HAPipelineResetRequest.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/HAPipelineResetResponse.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/IHAPipelineResetRequest.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/IHAPipelineResetResponse.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/msg/HAMessageWrapper.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/msg/HASendState.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/msg/IHAMessageWrapper.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/msg/IHASendState.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/pipeline/AbstractPipelineChangeException.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/pipeline/AbstractPipelineException.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/pipeline/ImmediateDownstreamReplicationException.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/pipeline/NestedPipelineException.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/ha/pipeline/PipelineImmediateDownstreamReplicationException.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/quorum/ServiceLookup.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/ha/msg/TestHASendState.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/ha/pipeline/AbstractHASendAndReceiveTestCase.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/ha/pipeline/TestSocketsDirect.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3JustKills.java

Removed Paths:
-------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/journal/ha/AbstractHAJournalTestCase.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/journal/ha/TestAll.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/journal/ha/TestHAWORMStrategy.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/journal/ha/TestHAWritePipeline.java
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/test/com/bigdata/journal/ha/TestJournalHA.java

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


Property changes on: branches/BIGDATA_RELEASE_1_3_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BIGDATA_OPENRDF_2_6_9_UPDATE:6769-6785
/branches/BIGDATA_RELEASE_1_2_0:6766-7380
/branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/INT64_BRANCH:4486-4522
/branches/JOURNAL_HA_BRANCH:2596-4066
/branches/LARGE_LITERALS_REFACTOR:4175-4387
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/QUADS_QUERY_BRANCH:4525-4531,4550-4584,4586-4609,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE:7215-7271
/branches/RWSTORE_1_1_0_DEBUG:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH:4814-4836
/branches/ZK_DISCONNECT_HANDLING:7465-7484
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:3392-3437,3656-4061
   + /branches/BIGDATA_OPENRDF_2_6_9_UPDATE:6769-6785
/branches/BIGDATA_RELEASE_1_2_0:6766-7380
/branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/INT64_BRANCH:4486-4522
/branches/JOURNAL_HA_BRANCH:2596-4066
/branches/LARGE_LITERALS_REFACTOR:4175-4387
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/MGC_1_3_0:7609-7752
/branches/QUADS_QUERY_BRANCH:4525-4531,4550-4584,4586-4609,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE:7215-7271
/branches/RWSTORE_1_1_0_DEBUG:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH:4814-4836
/branches/ZK_DISCONNECT_HANDLING:7465-7484
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-2730
/branches/fko:3150-3194
/trunk:3392-3437,3656-4061


Property changes on: branches/BIGDATA_RELEASE_1_3_0/bigdata/lib/jetty
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/lib/jetty:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/jetty:6766-7380
/branches/INT64_BRANCH/bigdata/lib/jetty:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/lib/jetty:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/lib/jetty:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/lib/jetty:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/lib/jetty:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/lib/jetty:7465-7484
   + /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/lib/jetty:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/lib/jetty:6766-7380
/branches/INT64_BRANCH/bigdata/lib/jetty:4486-4522
/branches/MGC_1_3_0/bigdata/lib/jetty:7609-7752
/branches/QUADS_QUERY_BRANCH/bigdata/lib/jetty:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/lib/jetty:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/lib/jetty:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/lib/jetty:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/lib/jetty:7465-7484


Property changes on: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/aggregate
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/aggregate:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/aggregate:6766-7380
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/bop/aggregate:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/bop/aggregate:7465-7484
   + /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/aggregate:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/aggregate:6766-7380
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4486-4522
/branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/aggregate:7609-7752
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/bop/aggregate:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/aggregate:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/aggregate:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/bop/aggregate:7465-7484


Property changes on: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/joinGraph:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/joinGraph:6766-7380
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/bop/joinGraph:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/bop/joinGraph:7465-7484
   + /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/joinGraph:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/joinGraph:6766-7380
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4486-4522
/branches/MGC_1_3_0/bigdata/src/java/com/bigdata/bop/joinGraph:7609-7752
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/bop/joinGraph:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/joinGraph:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/joinGraph:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/bop/joinGraph:7465-7484


Property changes on: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/bop/util
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/util:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/util:6766-7380
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/util:4486-4522
/branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/util:4525-4531,4533-4548,4550-4584,4586-4609,4611-4632,4634-4643,4646-4672,4674-4685,4687-4693,4697-4735,4737-4782,4784-4792,4794-4796,4798-4801
/branches/READ_CACHE/bigdata/src/java/com/bigdata/bop/util:7215-7271
/branches/RWSTORE_1_1_0_DEBUG/bigdata/src/java/com/bigdata/bop/util:5896-5935
/branches/TIDS_PLUS_BLOBS_BRANCH/bigdata/src/java/com/bigdata/bop/util:4814-4836
/branches/ZK_DISCONNECT_HANDLING/bigdata/src/java/com/bigdata/bop/util:7465-7484
   + /branches/BIGDATA_OPENRDF_2_6_9_UPDATE/bigdata/src/java/com/bigdata/bop/util:6769-6785
/branches/BIGDATA_RELEASE_1_2_0/bigdata/src/java/com/bigdata/bop/util:6766-7380
/branches/INT64_BRANCH/bigdata/src/java/com/bigdata/bop/util:4486-4522
/branches/MGC_1_3_0/bigdata/src/ja...
 
[truncated message content]