3 files changed, 226 insertions, 231 deletions

diff --git a/databases/cassandra/Makefile b/databases/cassandra/Makefile
index b040f5eb47ab..df0cd8a2017d 100644
--- a/databases/cassandra/Makefile
+++ b/databases/cassandra/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cassandra
-PORTVERSION=	0.5.1
+PORTVERSION=	0.6.1
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}
@@ -21,11 +21,11 @@ NO_BUILD=	yes
 USE_JAVA=	yes
 
 post-patch:
-	${MV} ${WRKSRC}/conf/log4j.properties ${WRKSRC}/conf/log4j.properties.sample
-	${MV} ${WRKSRC}/conf/storage-conf.xml ${WRKSRC}/conf/storage-conf.xml.sample
+	@${MV} ${WRKSRC}/conf/log4j.properties ${WRKSRC}/conf/log4j.properties.sample
+	@${MV} ${WRKSRC}/conf/storage-conf.xml ${WRKSRC}/conf/storage-conf.xml.sample
 
 do-install:
-	${MKDIR} ${DATADIR}
-	${CP} -R ${WRKSRC}/* ${DATADIR}
+	@${MKDIR} ${DATADIR}
+	@${CP} -R ${WRKSRC}/* ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/databases/cassandra/distinfo b/databases/cassandra/distinfo
index 470c0348fd3e..bb9766da79cf 100644
--- a/databases/cassandra/distinfo
+++ b/databases/cassandra/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (apache-cassandra-0.6.1-bin.tar.gz) = 6aa1764f76e26fbc9d62b59e2f6a9ab4
+SHA256 (apache-cassandra-0.6.1-bin.tar.gz) = 53df4ba64cbe8a707f29fd9b4a10a329d88de06d8636f36c33cb68c4b2200ec4
+SIZE (apache-cassandra-0.6.1-bin.tar.gz) = 9803814
diff --git a/databases/cassandra/pkg-plist b/databases/cassandra/pkg-plist
index 5c84c553caed..30d3ed05cf1d 100644
--- a/databases/cassandra/pkg-plist
+++ b/databases/cassandra/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 %%DATADIR%%/CHANGES.txt
 %%DATADIR%%/DISCLAIMER.txt
 %%DATADIR%%/LICENSE.txt
@@ -9,11 +10,17 @@
 %%DATADIR%%/bin/cassandra-cli.bat
 %%DATADIR%%/bin/cassandra.bat
 %%DATADIR%%/bin/cassandra.in.sh
+%%DATADIR%%/bin/clustertool
 %%DATADIR%%/bin/json2sstable
 %%DATADIR%%/bin/nodeprobe
+%%DATADIR%%/bin/nodetool
 %%DATADIR%%/bin/sstable2json
+%%DATADIR%%/bin/sstablekeys
 %%DATADIR%%/bin/stop-server
+%%DATADIR%%/conf/access.properties
+%%DATADIR%%/conf/log4j-tools.properties
 %%DATADIR%%/conf/log4j.properties.sample
+%%DATADIR%%/conf/passwd.properties
 %%DATADIR%%/conf/storage-conf.xml.sample
 %%DATADIR%%/interface/cassandra.thrift
 %%DATADIR%%/javadoc/allclasses-frame.html
@@ -23,6 +30,46 @@
 %%DATADIR%%/javadoc/help-doc.html
 %%DATADIR%%/javadoc/index-all.html
 %%DATADIR%%/javadoc/index.html
+%%DATADIR%%/javadoc/org/apache/cassandra/auth/AllowAllAuthenticator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/auth/IAuthenticator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/auth/SimpleAuthenticator.PasswordMode.html
+%%DATADIR%%/javadoc/org/apache/cassandra/auth/SimpleAuthenticator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/auth/class-use/AllowAllAuthenticator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/auth/class-use/IAuthenticator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/auth/class-use/SimpleAuthenticator.PasswordMode.html
+%%DATADIR%%/javadoc/org/apache/cassandra/auth/class-use/SimpleAuthenticator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/auth/package-frame.html
+%%DATADIR%%/javadoc/org/apache/cassandra/auth/package-summary.html
+%%DATADIR%%/javadoc/org/apache/cassandra/auth/package-tree.html
+%%DATADIR%%/javadoc/org/apache/cassandra/auth/package-use.html
+%%DATADIR%%/javadoc/org/apache/cassandra/avro/AvroValidation.html
+%%DATADIR%%/javadoc/org/apache/cassandra/avro/CassandraDaemon.html
+%%DATADIR%%/javadoc/org/apache/cassandra/avro/CassandraServer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/avro/KeyspaceNotDefinedException.html
+%%DATADIR%%/javadoc/org/apache/cassandra/avro/class-use/AvroValidation.html
+%%DATADIR%%/javadoc/org/apache/cassandra/avro/class-use/CassandraDaemon.html
+%%DATADIR%%/javadoc/org/apache/cassandra/avro/class-use/CassandraServer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/avro/class-use/KeyspaceNotDefinedException.html
+%%DATADIR%%/javadoc/org/apache/cassandra/avro/package-frame.html
+%%DATADIR%%/javadoc/org/apache/cassandra/avro/package-summary.html
+%%DATADIR%%/javadoc/org/apache/cassandra/avro/package-tree.html
+%%DATADIR%%/javadoc/org/apache/cassandra/avro/package-use.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/AbstractCache.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/IAggregatableCacheProvider.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/ICacheExpungeHook.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/InstrumentedCache.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/JMXInstrumentedCache.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/JMXInstrumentedCacheMBean.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/class-use/AbstractCache.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/class-use/IAggregatableCacheProvider.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/class-use/ICacheExpungeHook.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/class-use/InstrumentedCache.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/class-use/JMXInstrumentedCache.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/class-use/JMXInstrumentedCacheMBean.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/package-frame.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/package-summary.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/package-tree.html
+%%DATADIR%%/javadoc/org/apache/cassandra/cache/package-use.html
 %%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
@@ -52,22 +99,18 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/AIOExecutorService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/Context.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/JMXEnabledThreadPoolExecutor.html
+%%DATADIR%%/javadoc/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutorMBean.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/class-use/AIOExecutorService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/Context.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/JMXEnabledThreadPoolExecutor.html
+%%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/JMXEnabledThreadPoolExecutorMBean.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/package-frame.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/package-summary.html
@@ -75,10 +118,14 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/package-use.html
 %%DATADIR%%/javadoc/org/apache/cassandra/config/CFMetaData.html
 %%DATADIR%%/javadoc/org/apache/cassandra/config/DatabaseDescriptor.CommitLogSync.html
+%%DATADIR%%/javadoc/org/apache/cassandra/config/DatabaseDescriptor.DiskAccessMode.html
 %%DATADIR%%/javadoc/org/apache/cassandra/config/DatabaseDescriptor.html
+%%DATADIR%%/javadoc/org/apache/cassandra/config/KSMetaData.html
 %%DATADIR%%/javadoc/org/apache/cassandra/config/class-use/CFMetaData.html
 %%DATADIR%%/javadoc/org/apache/cassandra/config/class-use/DatabaseDescriptor.CommitLogSync.html
+%%DATADIR%%/javadoc/org/apache/cassandra/config/class-use/DatabaseDescriptor.DiskAccessMode.html
 %%DATADIR%%/javadoc/org/apache/cassandra/config/class-use/DatabaseDescriptor.html
+%%DATADIR%%/javadoc/org/apache/cassandra/config/class-use/KSMetaData.html
 %%DATADIR%%/javadoc/org/apache/cassandra/config/package-frame.html
 %%DATADIR%%/javadoc/org/apache/cassandra/config/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/config/package-tree.html
@@ -93,24 +140,15 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/ColumnFamilyStoreMBean.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/ColumnIndexer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/ColumnSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/CommitLog.CommitLogContext.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/CommitLog.CommitLogFileComparator.html
-%%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
@@ -118,12 +156,10 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/ReadResponse.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/ReadVerbHandler.ReadContext.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/ReadVerbHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/RecoveryManager.html
 %%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.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/Scanner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/SliceByNamesReadCommand.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/SliceFromReadCommand.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/SuperColumn.html
@@ -143,24 +179,15 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ColumnFamilyStoreMBean.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ColumnIndexer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ColumnSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/CommitLog.CommitLogContext.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/CommitLog.CommitLogFileComparator.html
-%%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
@@ -168,12 +195,10 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ReadResponse.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ReadVerbHandler.ReadContext.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ReadVerbHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/RecoveryManager.html
 %%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.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/Scanner.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/SliceByNamesReadCommand.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/SliceFromReadCommand.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/SuperColumn.html
@@ -183,6 +208,18 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/Table.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/WriteResponse.WriteResponseSerializer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/WriteResponse.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/CommitLog.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/CommitLogExecutorServiceMBean.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/CommitLogSegment.CommitLogContext.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/CommitLogSegment.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/class-use/CommitLog.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/class-use/CommitLogExecutorServiceMBean.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/class-use/CommitLogSegment.CommitLogContext.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/class-use/CommitLogSegment.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/package-frame.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/package-summary.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/package-tree.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/package-use.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/filter/AbstractColumnIterator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/filter/ColumnIterator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/filter/IdentityQueryFilter.html
@@ -240,7 +277,6 @@
 %%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
@@ -256,7 +292,6 @@
 %%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
@@ -270,6 +305,10 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/FailureDetector.html
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/FailureDetectorMBean.html
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/GossipDigest.html
+%%DATADIR%%/javadoc/org/apache/cassandra/gms/Gossiper.GossipDigestAck2VerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/gms/Gossiper.GossipDigestAckVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/gms/Gossiper.GossipDigestSynVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/gms/Gossiper.JoinVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/Gossiper.html
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/IEndPointStateChangePublisher.html
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/IEndPointStateChangeSubscriber.html
@@ -282,6 +321,10 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/class-use/FailureDetector.html
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/class-use/FailureDetectorMBean.html
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/class-use/GossipDigest.html
+%%DATADIR%%/javadoc/org/apache/cassandra/gms/class-use/Gossiper.GossipDigestAck2VerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/gms/class-use/Gossiper.GossipDigestAckVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/gms/class-use/Gossiper.GossipDigestSynVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/gms/class-use/Gossiper.JoinVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/class-use/Gossiper.html
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/class-use/IEndPointStateChangePublisher.html
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/class-use/IEndPointStateChangeSubscriber.html
@@ -293,54 +336,72 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/gms/package-summary.html
 %%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/hadoop/ColumnFamilyInputFormat.html
+%%DATADIR%%/javadoc/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.html
+%%DATADIR%%/javadoc/org/apache/cassandra/hadoop/ColumnFamilySplit.html
+%%DATADIR%%/javadoc/org/apache/cassandra/hadoop/ConfigHelper.html
+%%DATADIR%%/javadoc/org/apache/cassandra/hadoop/class-use/ColumnFamilyInputFormat.html
+%%DATADIR%%/javadoc/org/apache/cassandra/hadoop/class-use/ColumnFamilyRecordReader.html
+%%DATADIR%%/javadoc/org/apache/cassandra/hadoop/class-use/ColumnFamilySplit.html
+%%DATADIR%%/javadoc/org/apache/cassandra/hadoop/class-use/ConfigHelper.html
+%%DATADIR%%/javadoc/org/apache/cassandra/hadoop/package-frame.html
+%%DATADIR%%/javadoc/org/apache/cassandra/hadoop/package-summary.html
+%%DATADIR%%/javadoc/org/apache/cassandra/hadoop/package-tree.html
+%%DATADIR%%/javadoc/org/apache/cassandra/hadoop/package-use.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/DeletionService.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
 %%DATADIR%%/javadoc/org/apache/cassandra/io/IndexHelper.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/IndexSummary.KeyPosition.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/IndexSummary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/IteratingRow.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/SSTable.PositionSize.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/SSTable.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/SSTableDeletingReference.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/DeletionService.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
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/IndexHelper.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/IndexSummary.KeyPosition.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/IndexSummary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/IteratingRow.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/SSTable.PositionSize.html
 %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/SSTable.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/class-use/SSTableDeletingReference.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/io/util/BufferedRandomAccessFile.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/DataOutputBuffer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/FileDataInput.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/FileUtils.FileComparator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/FileUtils.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/MappedFileDataInput.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/class-use/BufferedRandomAccessFile.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/class-use/DataOutputBuffer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/class-use/FileDataInput.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/class-use/FileUtils.FileComparator.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/class-use/FileUtils.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/class-use/MappedFileDataInput.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/package-frame.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/package-summary.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/package-tree.html
+%%DATADIR%%/javadoc/org/apache/cassandra/io/util/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
@@ -364,71 +425,35 @@
 %%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/FileStreamTask.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/IVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/net/IncomingTcpConnection.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/Message.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/MessageDeliveryTask.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/MessagingService.html
+%%DATADIR%%/javadoc/org/apache/cassandra/net/OutboundTcpConnection.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/ProtocolHeader.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/SelectionKeyHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/SelectorManager.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/TcpConnection.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/TcpConnectionHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/UdpConnection.html
+%%DATADIR%%/javadoc/org/apache/cassandra/net/ResponseVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/CompactEndPointSerializationHelper.html
+%%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/FileStreamTask.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/IVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/IncomingTcpConnection.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/MessagingService.html
+%%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/OutboundTcpConnection.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/ProtocolHeader.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/SelectionKeyHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/SelectorManager.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/TcpConnection.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/TcpConnectionHandler.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/UdpConnection.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/FastSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/ISerializer.html
-%%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/SerializerAttribute.html
+%%DATADIR%%/javadoc/org/apache/cassandra/net/class-use/ResponseVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/SerializerType.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/StartState.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/StreamContextManager.StreamCompletionAction.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/StreamContextManager.StreamContext.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/StreamContextManager.StreamContextSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/StreamContextManager.StreamStatus.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/StreamContextManager.StreamStatusMessage.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/StreamContextManager.StreamStatusMessageSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/StreamContextManager.StreamStatusSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/StreamContextManager.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/TcpReader.TcpReaderState.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/TcpReader.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/FastSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/ISerializer.html
-%%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/SerializerAttribute.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/SerializerType.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/StartState.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/StreamContextManager.StreamCompletionAction.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/StreamContextManager.StreamContext.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/StreamContextManager.StreamContextSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/StreamContextManager.StreamStatus.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/StreamContextManager.StreamStatusMessage.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/StreamContextManager.StreamStatusMessageSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/StreamContextManager.StreamStatusSerializer.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/StreamContextManager.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/TcpReader.TcpReaderState.html
-%%DATADIR%%/javadoc/org/apache/cassandra/net/io/class-use/TcpReader.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/package-frame.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/net/io/package-tree.html
@@ -452,69 +477,22 @@
 %%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/EmbeddedCassandraService.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/GCInspector.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/IResponseResolver.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.Verb.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/StorageService.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/StorageServiceMBean.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/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
@@ -523,77 +501,72 @@
 %%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/EmbeddedCassandraService.html
+%%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/GCInspector.html
 %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use/IResponseResolver.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.Verb.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.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/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/streaming/IncomingStreamReader.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/StreamFinishedVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/StreamIn.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/StreamInitiateDoneVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/StreamInitiateVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/StreamOut.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/StreamOutManager.StreamFile.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/StreamOutManager.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/StreamRequestVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/StreamingService.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/StreamingServiceMBean.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/class-use/IncomingStreamReader.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/class-use/StreamFinishedVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/class-use/StreamIn.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/class-use/StreamInitiateDoneVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/class-use/StreamInitiateVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/class-use/StreamOut.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/class-use/StreamOutManager.StreamFile.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/class-use/StreamOutManager.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/class-use/StreamRequestVerbHandler.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/class-use/StreamingService.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/class-use/StreamingServiceMBean.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/package-frame.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/package-summary.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/package-tree.html
+%%DATADIR%%/javadoc/org/apache/cassandra/streaming/package-use.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/CassandraDaemon.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/CassandraServer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/ThriftGlue.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/ThriftValidation.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/CassandraDaemon.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/CassandraServer.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/ThriftGlue.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use/ThriftValidation.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/package-frame.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/package-summary.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/package-tree.html
+%%DATADIR%%/javadoc/org/apache/cassandra/thrift/package-use.html
+%%DATADIR%%/javadoc/org/apache/cassandra/tools/ClusterCmd.html
+%%DATADIR%%/javadoc/org/apache/cassandra/tools/NodeCmd.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/NodeProbe.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/ClusterCmd.html
+%%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/NodeCmd.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/NodeProbe.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/SSTableExport.html
 %%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use/SSTableImport.html
@@ -605,20 +578,13 @@
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/BitSetSerializer.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/ExpiringMap.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/FBUtilities.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
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/Filter.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/GuidGenerator.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/HashingSchemes.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/ICacheExpungeHook.html
-%%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/LatencyTracker.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
@@ -628,27 +594,19 @@
 %%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/BitSetSerializer.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/ExpiringMap.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/FBUtilities.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
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/Filter.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/GuidGenerator.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/HashingSchemes.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/ICacheExpungeHook.html
-%%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/LatencyTracker.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
@@ -658,7 +616,6 @@
 %%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
@@ -673,19 +630,41 @@
 %%DATADIR%%/javadoc/serialized-form.html
 %%DATADIR%%/javadoc/stylesheet.css
 %%DATADIR%%/lib/antlr-3.1.3.jar
-%%DATADIR%%/lib/apache-cassandra-0.5.1.jar
+%%DATADIR%%/lib/apache-cassandra-0.6.1.jar
+%%DATADIR%%/lib/avro-1.2.0-dev.jar
 %%DATADIR%%/lib/clhm-production.jar
 %%DATADIR%%/lib/commons-cli-1.1.jar
+%%DATADIR%%/lib/commons-codec-1.2.jar
 %%DATADIR%%/lib/commons-collections-3.2.1.jar
 %%DATADIR%%/lib/commons-lang-2.4.jar
-%%DATADIR%%/lib/flexjson-1.7.jar
-%%DATADIR%%/lib/google-collect-1.0-rc1.jar
+%%DATADIR%%/lib/google-collections-1.0.jar
+%%DATADIR%%/lib/hadoop-core-0.20.1.jar
 %%DATADIR%%/lib/high-scale-lib.jar
+%%DATADIR%%/lib/ivy-2.1.0.jar
+%%DATADIR%%/lib/jackson-core-asl-1.4.0.jar
+%%DATADIR%%/lib/jackson-mapper-asl-1.4.0.jar
 %%DATADIR%%/lib/jline-0.9.94.jar
-%%DATADIR%%/lib/json_simple-1.1.jar
-%%DATADIR%%/lib/junit-4.6.jar
-%%DATADIR%%/lib/libthrift-r820831.jar
-%%DATADIR%%/lib/log4j-1.2.15.jar
+%%DATADIR%%/lib/json-simple-1.1.jar
+%%DATADIR%%/lib/libthrift-r917130.jar
+%%DATADIR%%/lib/licenses/antlr-3.1.3.txt
+%%DATADIR%%/lib/licenses/avro-1.2.0-dev.txt
+%%DATADIR%%/lib/licenses/clhm-production.txt
+%%DATADIR%%/lib/licenses/commons-cli-1.1.txt
+%%DATADIR%%/lib/licenses/commons-codec-1.2.txt
+%%DATADIR%%/lib/licenses/commons-collections-3.2.1.txt
+%%DATADIR%%/lib/licenses/commons-lang-2.4.txt
+%%DATADIR%%/lib/licenses/google-collections-1.0.txt
+%%DATADIR%%/lib/licenses/hadoop-core-0.20.1.txt
+%%DATADIR%%/lib/licenses/high-scale-lib.txt
+%%DATADIR%%/lib/licenses/jackson-core-asl-1.4.0.txt
+%%DATADIR%%/lib/licenses/jackson-mapper-asl-1.4.0.txt
+%%DATADIR%%/lib/licenses/jline-0.9.94.txt
+%%DATADIR%%/lib/licenses/json-simple-1.1.txt
+%%DATADIR%%/lib/licenses/libthrift-r917130.txt
+%%DATADIR%%/lib/licenses/log4j-1.2.14.txt
+%%DATADIR%%/lib/licenses/slf4j-api-1.5.8.txt
+%%DATADIR%%/lib/licenses/slf4j-log4j12-1.5.8.txt
+%%DATADIR%%/lib/log4j-1.2.14.jar
 %%DATADIR%%/lib/slf4j-api-1.5.8.jar
 %%DATADIR%%/lib/slf4j-log4j12-1.5.8.jar
 @dirrmtry %%DATADIR%%/lib/licenses
@@ -695,6 +674,10 @@
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/utils
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/tools/class-use
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/tools
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/thrift/class-use
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/thrift
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/streaming/class-use
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/streaming
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/service/class-use
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/service
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/net/sink/class-use
@@ -705,8 +688,12 @@
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/net
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/locator/class-use
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/locator
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/io/util/class-use
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/io/util
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/io/class-use
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/io
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/hadoop/class-use
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/hadoop
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/gms/class-use
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/gms
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/dht/class-use
@@ -715,6 +702,8 @@
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db/marshal
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db/filter/class-use
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db/filter
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog/class-use
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db/commitlog
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/db
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/config/class-use
@@ -725,6 +714,12 @@
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/client
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/cli/class-use
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/cli
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/cache/class-use
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/cache
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/avro/class-use
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/avro
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/auth/class-use
+@dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra/auth
 @dirrmtry %%DATADIR%%/javadoc/org/apache/cassandra
 @dirrmtry %%DATADIR%%/javadoc/org/apache
 @dirrmtry %%DATADIR%%/javadoc/org