- Update to 0.5.1

PR:	ports/144997
Approved by:	gslin@gslin.org (maintainer)

3 files changed, 199 insertions, 86 deletions

diff --git a/databases/cassandra/Makefile b/databases/cassandra/Makefile
index 2b238da09efe..b040f5eb47ab 100644
--- a/databases/cassandra/Makefile
+++ b/databases/cassandra/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	cassandra
-PORTVERSION=	0.4.2
+PORTVERSION=	0.5.1
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=	incubator/cassandra/${PORTVERSION}
-DISTNAME=	apache-cassandra-incubating-${PORTVERSION}
+MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}
+DISTNAME=	apache-cassandra-${PORTVERSION}
 EXTRACT_SUFX=	-bin.tar.gz
 
 MAINTAINER=	gslin@gslin.org
diff --git a/databases/cassandra/distinfo b/databases/cassandra/distinfo
index b3b9150f5ef6..470c0348fd3e 100644
--- a/databases/cassandra/distinfo
+++ b/databases/cassandra/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache-cassandra-incubating-0.4.2-bin.tar.gz) = 86adaf687594f3928c2e22d8432e0ca8
-SHA256 (apache-cassandra-incubating-0.4.2-bin.tar.gz) = 06e77a5ee84fd8f58c882a498294b0e26f4f88548f4c91101d52d4c2733ef0d6
-SIZE (apache-cassandra-incubating-0.4.2-bin.tar.gz) = 5903767
+MD5 (apache-cassandra-0.5.1-bin.tar.gz) = 57ad909a90db7597ca91e2ec0ad5e507
+SHA256 (apache-cassandra-0.5.1-bin.tar.gz) = 0fe25a4699ab65e41ca32335bf860496232c3840449a3ac44829e74e26b9c1aa
+SIZE (apache-cassandra-0.5.1-bin.tar.gz) = 5716040
diff --git a/databases/cassandra/pkg-plist b/databases/cassandra/pkg-plist
index 50ac466bf432..5c84c553caed 100644
--- a/databases/cassandra/pkg-plist
+++ b/databases/cassandra/pkg-plist
@@ -1,15 +1,17 @@
-@comment $FreeBSD$
-%%DATADIR%%/BUGS.txt
 %%DATADIR%%/CHANGES.txt
 %%DATADIR%%/DISCLAIMER.txt
 %%DATADIR%%/LICENSE.txt
+%%DATADIR%%/NEWS.txt
 %%DATADIR%%/NOTICE.txt
 %%DATADIR%%/README.txt
 %%DATADIR%%/bin/cassandra
 %%DATADIR%%/bin/cassandra-cli
+%%DATADIR%%/bin/cassandra-cli.bat
 %%DATADIR%%/bin/cassandra.bat
 %%DATADIR%%/bin/cassandra.in.sh
+%%DATADIR%%/bin/json2sstable
 %%DATADIR%%/bin/nodeprobe
+%%DATADIR%%/bin/sstable2json
 %%DATADIR%%/bin/stop-server
 %%DATADIR%%/conf/log4j.properties.sample
 %%DATADIR%%/conf/storage-conf.xml.sample
@@ -24,6 +26,7 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/cli/CliClient.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cli/CliCompiler.ANTLRNoCaseStringStream.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cli/CliCompiler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cli/CliCompleter.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cli/CliMain.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cli/CliOptions.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cli/CliSessionState.html
@@ -31,6 +34,7 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/cli/class-use/CliClient.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cli/class-use/CliCompiler.ANTLRNoCaseStringStream.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cli/class-use/CliCompiler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cli/class-use/CliCompleter.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cli/class-use/CliMain.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cli/class-use/CliOptions.html
 %%DATADIR%%/javadoc/org/apache/cassandra/cli/class-use/CliSessionState.html
@@ -47,28 +51,24 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/client/package-use.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/AIOExecutorService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/Context.html
-%%DATADIR%%/javadoc/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorMBean.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/IExecutorMBean.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/IStage.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/MultiThreadedStage.html
+%%DATADIR%%/javadoc/org/apache/cassandra/concurrent/NamedThreadFactory.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/SingleThreadedStage.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/StageManager.html
-%%DATADIR%%/javadoc/org/apache/cassandra/concurrent/ThreadFactoryImpl.html
-%%DATADIR%%/javadoc/org/apache/cassandra/concurrent/ThreadLocalContext.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/AIOExecutorService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/Context.html
-%%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/DebuggableScheduledThreadPoolExecutor.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/DebuggableThreadPoolExecutor.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/DebuggableThreadPoolExecutorMBean.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/IExecutorMBean.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/IStage.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/MultiThreadedStage.html
+%%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/NamedThreadFactory.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/SingleThreadedStage.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/StageManager.html
-%%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/ThreadFactoryImpl.html
-%%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/ThreadLocalContext.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/package-frame.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/package-tree.html
@@ -98,15 +98,21 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/CommitLog.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/CommitLogExecutorService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/CommitLogExecutorServiceMBean.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/CompactionManager.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/CompactionManagerMBean.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/DataFileVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/DecoratedKey.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/HintedHandOffManager.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/IColumn.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/IColumnContainer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/IFlushable.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/IScanner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/KeyspaceNotDefinedException.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/Memtable.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/RangeCommand.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/RangeReply.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/RangeSliceCommand.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/RangeSliceReply.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/ReadCommand.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/ReadRepairVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/ReadResponse.html
@@ -116,7 +122,6 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/Row.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/RowMutation.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/RowMutationMessage.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/RowMutationVerbHandler.RowMutationContext.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/RowMutationVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/Scanner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/SliceByNamesReadCommand.html
@@ -124,8 +129,6 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/SuperColumn.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/SystemTable.StorageMetadata.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/SystemTable.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/Table.BootStrapInitiateVerbHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/Table.BootstrapCompletionHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/Table.TableMetadata.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/Table.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/WriteResponse.WriteResponseSerializer.html
@@ -145,15 +148,21 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/CommitLog.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/CommitLogExecutorService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/CommitLogExecutorServiceMBean.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/CompactionManager.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/CompactionManagerMBean.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/DataFileVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/DecoratedKey.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/HintedHandOffManager.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/IColumn.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/IColumnContainer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/IFlushable.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/IScanner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/KeyspaceNotDefinedException.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/Memtable.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/RangeCommand.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/RangeReply.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/RangeSliceCommand.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/RangeSliceReply.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ReadCommand.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ReadRepairVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ReadResponse.html
@@ -163,7 +172,6 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/Row.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/RowMutation.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/RowMutationMessage.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/RowMutationVerbHandler.RowMutationContext.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/RowMutationVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/Scanner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/SliceByNamesReadCommand.html
@@ -171,8 +179,6 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/SuperColumn.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/SystemTable.StorageMetadata.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/SystemTable.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/Table.BootStrapInitiateVerbHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/Table.BootstrapCompletionHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/Table.TableMetadata.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/Table.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/WriteResponse.WriteResponseSerializer.html
@@ -223,32 +229,34 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/package-use.html
+%%DATADIR%%/javadoc/org/apache/cassandra/dht/AbstractBounds.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/BigIntegerToken.html
+%%DATADIR%%/javadoc/org/apache/cassandra/dht/BootStrapper.BootstrapTokenVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/BootStrapper.html
-%%DATADIR%%/javadoc/org/apache/cassandra/dht/BootstrapInitiateMessage.html
-%%DATADIR%%/javadoc/org/apache/cassandra/dht/BootstrapMetadataVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/dht/Bounds.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/BytesToken.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/CollatingOrderPreservingPartitioner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/IPartitioner.html
-%%DATADIR%%/javadoc/org/apache/cassandra/dht/LeaveJoinProtocolImpl.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/OrderPreservingPartitioner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/RandomPartitioner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/Range.html
+%%DATADIR%%/javadoc/org/apache/cassandra/dht/StreamInitiateMessage.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/StringToken.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/Token.TokenFactory.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/Token.TokenSerializer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/Token.html
+%%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/AbstractBounds.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/BigIntegerToken.html
+%%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/BootStrapper.BootstrapTokenVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/BootStrapper.html
-%%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/BootstrapInitiateMessage.html
-%%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/BootstrapMetadataVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/Bounds.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/BytesToken.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/CollatingOrderPreservingPartitioner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/IPartitioner.html
-%%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/LeaveJoinProtocolImpl.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/OrderPreservingPartitioner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/RandomPartitioner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/Range.html
+%%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/StreamInitiateMessage.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/StringToken.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/Token.TokenFactory.html
 %%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use/Token.TokenSerializer.html
@@ -286,11 +294,12 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/package-use.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/BufferedRandomAccessFile.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/CompactionIterator.CompactedRow.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/CompactionIterator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/DataInputBuffer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/DataOutputBuffer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/FastBufferedInputStream.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/FastBufferedOutputStream.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/FileStruct.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/ICompactSerializer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/ICompactSerializer2.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/IndexHelper.IndexInfo.html
@@ -298,13 +307,21 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/io/IteratingRow.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/SSTable.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/SSTableReader.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/SSTableScanner.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/SSTableTracker.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/SSTableWriter.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/StreamRequestVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/Streaming.StreamFinishedVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/Streaming.StreamInitiateDoneVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/Streaming.StreamInitiateVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/Streaming.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/BufferedRandomAccessFile.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/CompactionIterator.CompactedRow.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/CompactionIterator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/DataInputBuffer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/DataOutputBuffer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/FastBufferedInputStream.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/FastBufferedOutputStream.html
-%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/FileStruct.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/ICompactSerializer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/ICompactSerializer2.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/IndexHelper.IndexInfo.html
@@ -312,18 +329,31 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/IteratingRow.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/SSTable.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/SSTableReader.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/SSTableScanner.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/SSTableTracker.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/SSTableWriter.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/StreamRequestVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/Streaming.StreamFinishedVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/Streaming.StreamInitiateDoneVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/Streaming.StreamInitiateVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/Streaming.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/package-frame.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/package-use.html
+%%DATADIR%%/javadoc/org/apache/cassandra/locator/AbstractEndpointSnitch.html
 %%DATADIR%%/javadoc/org/apache/cassandra/locator/AbstractReplicationStrategy.html
+%%DATADIR%%/javadoc/org/apache/cassandra/locator/DatacenterEndPointSnitch.html
+%%DATADIR%%/javadoc/org/apache/cassandra/locator/DatacenterShardStategy.html
 %%DATADIR%%/javadoc/org/apache/cassandra/locator/EndPointSnitch.html
 %%DATADIR%%/javadoc/org/apache/cassandra/locator/IEndPointSnitch.html
 %%DATADIR%%/javadoc/org/apache/cassandra/locator/RackAwareStrategy.html
 %%DATADIR%%/javadoc/org/apache/cassandra/locator/RackUnawareStrategy.html
 %%DATADIR%%/javadoc/org/apache/cassandra/locator/TokenMetadata.html
+%%DATADIR%%/javadoc/org/apache/cassandra/locator/class-use/AbstractEndpointSnitch.html
 %%DATADIR%%/javadoc/org/apache/cassandra/locator/class-use/AbstractReplicationStrategy.html
+%%DATADIR%%/javadoc/org/apache/cassandra/locator/class-use/DatacenterEndPointSnitch.html
+%%DATADIR%%/javadoc/org/apache/cassandra/locator/class-use/DatacenterShardStategy.html
 %%DATADIR%%/javadoc/org/apache/cassandra/locator/class-use/EndPointSnitch.html
 %%DATADIR%%/javadoc/org/apache/cassandra/locator/class-use/IEndPointSnitch.html
 %%DATADIR%%/javadoc/org/apache/cassandra/locator/class-use/RackAwareStrategy.html
@@ -334,17 +364,13 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/locator/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/locator/package-use.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/CompactEndPointSerializationHelper.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/ConnectionStatistics.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/EndPoint.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/Header.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/HeaderTypes.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/IAsyncCallback.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/IAsyncResult.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/IMessagingService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/IVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/Message.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/MessageDeliveryTask.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/MessagingConfig.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/MessagingService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/ProtocolHeader.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/SelectionKeyHandler.html
@@ -353,17 +379,13 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/net/TcpConnectionHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/UdpConnection.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/CompactEndPointSerializationHelper.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/ConnectionStatistics.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/EndPoint.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/Header.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/HeaderTypes.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/IAsyncCallback.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/IAsyncResult.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/IMessagingService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/IVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/Message.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/MessageDeliveryTask.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/MessagingConfig.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/MessagingService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/ProtocolHeader.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/SelectionKeyHandler.html
@@ -376,7 +398,6 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/IStreamComplete.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/ProtocolHeaderState.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/ProtocolState.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/ReadNotCompleteException.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/SerializerAttribute.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/SerializerType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/StartState.html
@@ -395,7 +416,6 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/IStreamComplete.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/ProtocolHeaderState.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/ProtocolState.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/ReadNotCompleteException.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/SerializerAttribute.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/SerializerType.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/StartState.html
@@ -425,84 +445,170 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/net/sink/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/sink/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/sink/package-use.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/AntiEntropyService.Differencer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/AntiEntropyService.IValidator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/AntiEntropyService.NoopValidator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/AntiEntropyService.TreeRequestVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/AntiEntropyService.TreeResponseVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/AntiEntropyService.Validator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/AntiEntropyService.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.Client.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.Iface.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.Processor.ProcessFunction.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.Processor.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.batch_insert_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.batch_insert_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.describe_keyspace_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.describe_keyspace_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_count_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_count_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_key_range_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_key_range_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_range_slice_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_range_slice_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_slice_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_slice_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_string_list_property_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_string_list_property_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_string_property_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.get_string_property_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.insert_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.insert_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.multiget_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.multiget_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.multiget_slice_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.multiget_slice_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.remove_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Cassandra.remove_result.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/CassandraDaemon.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/CassandraServer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Column.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/ColumnOrSuperColumn.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/ColumnParent.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/ColumnPath.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/ConsistencyLevel.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/Constants.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/DatacenterWriteResponseHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/DigestMismatchException.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/IResponseResolver.html
-%%DATADIR%%/javadoc/org/apache/cassandra/service/MultiQuorumResponseHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/InvalidRequestException.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/KeySlice.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/NotFoundException.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/QuorumResponseHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/RangeSliceResponseResolver.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/RangeSliceVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/RangeVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/ReadResponseResolver.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/SlicePredicate.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/SliceRange.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/StorageLoadBalancer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/StorageProxy.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/StorageProxyMBean.html
-%%DATADIR%%/javadoc/org/apache/cassandra/service/StorageService.BootstrapInitiateDoneVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/StorageService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/StorageServiceMBean.html
-%%DATADIR%%/javadoc/org/apache/cassandra/service/StreamManager.BootstrapTerminateVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/StreamManager.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/SuperColumn.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/ThriftValidation.html
-%%DATADIR%%/javadoc/org/apache/cassandra/service/TokenUpdateVerbHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/service/WriteResponseResolver.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/TimedOutException.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/UnavailableException.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/WriteResponseHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AntiEntropyService.Differencer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AntiEntropyService.IValidator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AntiEntropyService.NoopValidator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AntiEntropyService.TreeRequestVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AntiEntropyService.TreeResponseVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AntiEntropyService.Validator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/AntiEntropyService.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.Client.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.Iface.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.Processor.ProcessFunction.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.Processor.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.batch_insert_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.batch_insert_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.describe_keyspace_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.describe_keyspace_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_count_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_count_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_key_range_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_key_range_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_range_slice_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_range_slice_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_slice_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_slice_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_string_list_property_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_string_list_property_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_string_property_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.get_string_property_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.insert_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.insert_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.multiget_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.multiget_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.multiget_slice_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.multiget_slice_result.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.remove_args.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Cassandra.remove_result.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/CassandraDaemon.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/CassandraServer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Column.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/ColumnOrSuperColumn.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/ColumnParent.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/ColumnPath.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/ConsistencyLevel.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/Constants.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/DatacenterSyncWriteResponseHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/DatacenterWriteResponseHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/DigestMismatchException.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/IResponseResolver.html
-%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/MultiQuorumResponseHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/InvalidRequestException.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/KeySlice.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/NotFoundException.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/QuorumResponseHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/RangeSliceResponseResolver.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/RangeSliceVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/RangeVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/ReadResponseResolver.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/SlicePredicate.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/SliceRange.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/StorageLoadBalancer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/StorageProxy.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/StorageProxyMBean.html
-%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/StorageService.BootstrapInitiateDoneVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/StorageService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/StorageServiceMBean.html
-%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/StreamManager.BootstrapTerminateVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/StreamManager.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/SuperColumn.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/ThriftValidation.html
-%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/TokenUpdateVerbHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/WriteResponseResolver.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/TimedOutException.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/UnavailableException.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/WriteResponseHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/package-frame.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/package-use.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/KeyChecker.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/MembershipCleaner.MembershipCleanerMessage.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/MembershipCleaner.MembershipCleanerMessageSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/MembershipCleaner.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/MembershipCleanerVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/NodeProbe.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/ThreadListBuilder.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/TokenUpdateVerbHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/TokenUpdater.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/KeyChecker.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/MembershipCleaner.MembershipCleanerMessage.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/MembershipCleaner.MembershipCleanerMessageSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/MembershipCleaner.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/MembershipCleanerVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/tools/SSTableExport.html
+%%DATADIR%%/javadoc/org/apache/cassandra/tools/SSTableImport.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/NodeProbe.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/ThreadListBuilder.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/TokenUpdateVerbHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/TokenUpdater.html
+%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/SSTableExport.html
+%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/SSTableImport.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/package-frame.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/package-use.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/AbstractStatsDeque.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/BasicUtilities.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/BitSetSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/BloomCalculations.BloomSpecification.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/BloomCalculations.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/BloomFilter.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/BoundedStatsDeque.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/Cachetable.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/CloseableIterator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/DestructivePQIterator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/FBUtilities.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/FastHash.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/FastHashMap.FastHashMapIterator.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/FastHashMap.KeyView.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/FastHashMap.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/FastLinkedHashMap.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/FastObjectHash.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/FileUtils.Deleter.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/FileUtils.FileComparator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/FileUtils.html
@@ -513,28 +619,26 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/ICachetable.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/Log4jLogger.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/LogUtil.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/MerkleTree.RowHash.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/MerkleTree.TreeRange.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/MerkleTree.TreeRangeIterator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/MerkleTree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/MurmurHash.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/PrimeFinder.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/Pair.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/ReducingIterator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/SafeMessageDigest.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/SimpleCondition.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/TimedStatsDeque.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/WrappedRunnable.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/XMLUtils.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/AbstractStatsDeque.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/BasicUtilities.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/BitSetSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/BloomCalculations.BloomSpecification.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/BloomCalculations.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/BloomFilter.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/BoundedStatsDeque.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/Cachetable.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/CloseableIterator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/DestructivePQIterator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/FBUtilities.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/FastHash.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/FastHashMap.FastHashMapIterator.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/FastHashMap.KeyView.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/FastHashMap.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/FastLinkedHashMap.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/FastObjectHash.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/FileUtils.Deleter.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/FileUtils.FileComparator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/FileUtils.html
@@ -545,11 +649,17 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/ICachetable.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/Log4jLogger.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/LogUtil.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/MerkleTree.RowHash.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/MerkleTree.TreeRange.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/MerkleTree.TreeRangeIterator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/MerkleTree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/MurmurHash.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/PrimeFinder.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/Pair.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/ReducingIterator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/SafeMessageDigest.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/SimpleCondition.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/TimedStatsDeque.html
+%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/WrappedRunnable.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/XMLUtils.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/package-frame.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/package-summary.html
@@ -563,7 +673,8 @@
 %%DATADIR%%/javadoc/serialized-form.html
 %%DATADIR%%/javadoc/stylesheet.css
 %%DATADIR%%/lib/antlr-3.1.3.jar
-%%DATADIR%%/lib/apache-cassandra-incubating-0.4.2.jar
+%%DATADIR%%/lib/apache-cassandra-0.5.1.jar
+%%DATADIR%%/lib/clhm-production.jar
 %%DATADIR%%/lib/commons-cli-1.1.jar
 %%DATADIR%%/lib/commons-collections-3.2.1.jar
 %%DATADIR%%/lib/commons-lang-2.4.jar
@@ -571,11 +682,13 @@
 %%DATADIR%%/lib/google-collect-1.0-rc1.jar
 %%DATADIR%%/lib/high-scale-lib.jar
 %%DATADIR%%/lib/jline-0.9.94.jar
+%%DATADIR%%/lib/json_simple-1.1.jar
 %%DATADIR%%/lib/junit-4.6.jar
-%%DATADIR%%/lib/libthrift-r808609.jar
+%%DATADIR%%/lib/libthrift-r820831.jar
 %%DATADIR%%/lib/log4j-1.2.15.jar
 %%DATADIR%%/lib/slf4j-api-1.5.8.jar
 %%DATADIR%%/lib/slf4j-log4j12-1.5.8.jar
+@dirrmtry %%DATADIR%%/lib/licenses
 @dirrmtry %%DATADIR%%/lib
 @dirrmtry %%DATADIR%%/javadoc/resources
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use