Update databases/apache-cassandra to 1.2.15.

Notable changes in 1.2.14
- Batchlog replay can be, and is throttled by default now.
  See batchlog_replay_throttle_in_kb setting in cassandra.yaml.

Notable changes in 1.2.11
- Added a new consistency level, LOCAL_ONE, that forces all CL.ONE operations
  to execute only in the local datacenter.
- New replace_address to supplant the (now removed) replace_token and
  replace_node workflows to replace a dead node in place.  Works like the
  old options, but takes the IP address of the node to be replaced.

Notable changes in 1.2.9
- A history of executed nodetool commands is now captured.
  It can be found in ~/.cassandra/nodetool.history. Other tools output files
  (cli and cqlsh history, .cqlshrc) are now centralized in ~/.cassandra,
  as well.
- A new sstablesplit utility allows to split large sstables offline.
- After performance testing for CASSANDRA-5727, the default LCS filesize
  has been changed from 5MB to 160MB.

Notable changes in 1.2.5
- Custom secondary index support has been added to CQL3. Refer to
  CQL3 documentation (http://cassandra.apache.org/doc/cql3/CQL.html)
  for details and examples.

Full release notes and changelogs:

https://git-wip-us.apache.org/repos/asf?p=cassandra.git;f=NEWS.txt;hb=refs/tags/cassandra-1.2.15
https://git-wip-us.apache.org/repos/asf?p=cassandra.git;f=CHANGES.txt;hb=refs/tags/cassandra-1.2.15

3 files changed, 126 insertions, 23 deletions

diff --git a/databases/apache-cassandra/Makefile b/databases/apache-cassandra/Makefile
index 9b9532d665b..deb28adf435 100644
--- a/databases/apache-cassandra/Makefile
+++ b/databases/apache-cassandra/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2014/01/10 20:02:08 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2014/02/14 10:25:23 fhajny Exp $
 #
 
 DISTNAME=	apache-cassandra-${CASSANDRA_VER}
 PKGNAME=	apache-cassandra-${CASSANDRA_VER:S/-//}
-PKGREVISION=	1
 CATEGORIES=	databases
 #MASTER_SITES=	${MASTER_SITE_APACHE:=cassandra/${CASSANDRA_VER:C/-.*//}/}
-MASTER_SITES=	http://archive.apache.org/dist/cassandra/1.2.4/
+MASTER_SITES=	http://archive.apache.org/dist/cassandra/${PKGVERSION_NOREV}/
 DISTFILES=	${DISTNAME}-bin${EXTRACT_SUFX}
 
 MAINTAINER=	tonnerre@NetBSD.org
@@ -24,7 +23,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.prefs.mk"
 
-CASSANDRA_VER=	1.2.4
+CASSANDRA_VER=	1.2.15
 CASSANDRA_HOME=	${PREFIX}/share/cassandra
 EGDIR=		${PREFIX}/share/examples/cassandra
 DOCDIR=		${PREFIX}/share/doc/cassandra
diff --git a/databases/apache-cassandra/PLIST b/databases/apache-cassandra/PLIST
index 910942c27d9..46c2a843935 100644
--- a/databases/apache-cassandra/PLIST
+++ b/databases/apache-cassandra/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2013/04/29 11:16:39 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/02/14 10:25:23 fhajny Exp $
 share/cassandra/bin/cassandra
 share/cassandra/bin/cassandra-cli
 share/cassandra/bin/cassandra-shuffle
@@ -11,6 +11,8 @@ share/cassandra/bin/sstable2json
 share/cassandra/bin/sstablekeys
 share/cassandra/bin/sstableloader
 share/cassandra/bin/sstablescrub
+share/cassandra/bin/sstablesplit
+share/cassandra/bin/sstableupgrade
 share/cassandra/bin/stop-server
 share/cassandra/interface/cassandra.thrift
 share/cassandra/javadoc/allclasses-frame.html
@@ -35,7 +37,6 @@ share/cassandra/javadoc/org/apache/cassandra/auth/IInternodeAuthenticator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/IResource.html
 share/cassandra/javadoc/org/apache/cassandra/auth/LegacyAuthenticator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/LegacyAuthorizer.html
-share/cassandra/javadoc/org/apache/cassandra/auth/MigrationListener.html
 share/cassandra/javadoc/org/apache/cassandra/auth/PasswordAuthenticator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/Permission.html
 share/cassandra/javadoc/org/apache/cassandra/auth/PermissionDetails.html
@@ -55,7 +56,6 @@ share/cassandra/javadoc/org/apache/cassandra/auth/class-use/IInternodeAuthentica
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/IResource.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/LegacyAuthenticator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/LegacyAuthorizer.html
-share/cassandra/javadoc/org/apache/cassandra/auth/class-use/MigrationListener.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/PasswordAuthenticator.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/Permission.html
 share/cassandra/javadoc/org/apache/cassandra/auth/class-use/PermissionDetails.html
@@ -71,6 +71,7 @@ share/cassandra/javadoc/org/apache/cassandra/cache/CacheKey.html
 share/cassandra/javadoc/org/apache/cassandra/cache/ConcurrentLinkedHashCache.html
 share/cassandra/javadoc/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.html
 share/cassandra/javadoc/org/apache/cassandra/cache/ICache.html
+share/cassandra/javadoc/org/apache/cassandra/cache/IMeasurableMemory.html
 share/cassandra/javadoc/org/apache/cassandra/cache/IRowCacheEntry.html
 share/cassandra/javadoc/org/apache/cassandra/cache/IRowCacheProvider.html
 share/cassandra/javadoc/org/apache/cassandra/cache/InstrumentingCache.html
@@ -87,6 +88,7 @@ share/cassandra/javadoc/org/apache/cassandra/cache/class-use/CacheKey.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/ConcurrentLinkedHashCache.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/ConcurrentLinkedHashCacheProvider.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/ICache.html
+share/cassandra/javadoc/org/apache/cassandra/cache/class-use/IMeasurableMemory.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/IRowCacheEntry.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/IRowCacheProvider.html
 share/cassandra/javadoc/org/apache/cassandra/cache/class-use/InstrumentingCache.html
@@ -144,7 +146,6 @@ share/cassandra/javadoc/org/apache/cassandra/client/package-frame.html
 share/cassandra/javadoc/org/apache/cassandra/client/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/client/package-tree.html
 share/cassandra/javadoc/org/apache/cassandra/client/package-use.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/CreationTimeAwareFuture.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/IExecutorMBean.html
@@ -155,7 +156,7 @@ share/cassandra/javadoc/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExec
 share/cassandra/javadoc/org/apache/cassandra/concurrent/NamedThreadFactory.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/Stage.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/StageManager.html
-share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/CreationTimeAwareFuture.html
+share/cassandra/javadoc/org/apache/cassandra/concurrent/TracingAwareExecutorService.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/DebuggableScheduledThreadPoolExecutor.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/DebuggableThreadPoolExecutor.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/IExecutorMBean.html
@@ -166,6 +167,7 @@ share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/JMXEnabledThre
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/NamedThreadFactory.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/Stage.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/StageManager.html
+share/cassandra/javadoc/org/apache/cassandra/concurrent/class-use/TracingAwareExecutorService.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/package-frame.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/concurrent/package-tree.html
@@ -334,6 +336,7 @@ share/cassandra/javadoc/org/apache/cassandra/cql3/Constants.Value.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Constants.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/KSPropDefs.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Lists.Appender.html
+share/cassandra/javadoc/org/apache/cassandra/cql3/Lists.DelayedValue.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Lists.Discarder.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Lists.DiscarderByIndex.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Lists.Literal.html
@@ -343,6 +346,7 @@ share/cassandra/javadoc/org/apache/cassandra/cql3/Lists.Setter.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Lists.SetterByIndex.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Lists.Value.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Lists.html
+share/cassandra/javadoc/org/apache/cassandra/cql3/Maps.DelayedValue.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Maps.DiscarderByKey.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Maps.Literal.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Maps.Marker.html
@@ -351,6 +355,7 @@ share/cassandra/javadoc/org/apache/cassandra/cql3/Maps.Setter.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Maps.SetterByKey.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Maps.Value.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Maps.html
+share/cassandra/javadoc/org/apache/cassandra/cql3/MeasurableForPreparedCache.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Operation.Addition.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Operation.ColumnDeletion.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Operation.ElementDeletion.html
@@ -370,6 +375,7 @@ share/cassandra/javadoc/org/apache/cassandra/cql3/ResultSet.Flag.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/ResultSet.Metadata.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/ResultSet.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Sets.Adder.html
+share/cassandra/javadoc/org/apache/cassandra/cql3/Sets.DelayedValue.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Sets.Discarder.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Sets.Literal.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/Sets.Marker.html
@@ -413,6 +419,7 @@ share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Constants.Value.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Constants.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/KSPropDefs.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Lists.Appender.html
+share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Lists.DelayedValue.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Lists.Discarder.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Lists.DiscarderByIndex.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Lists.Literal.html
@@ -422,6 +429,7 @@ share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Lists.Setter.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Lists.SetterByIndex.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Lists.Value.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Lists.html
+share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Maps.DelayedValue.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Maps.DiscarderByKey.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Maps.Literal.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Maps.Marker.html
@@ -430,6 +438,7 @@ share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Maps.Setter.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Maps.SetterByKey.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Maps.Value.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Maps.html
+share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/MeasurableForPreparedCache.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Operation.Addition.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Operation.ColumnDeletion.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Operation.ElementDeletion.html
@@ -449,6 +458,7 @@ share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/ResultSet.Flag.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/ResultSet.Metadata.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/ResultSet.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Sets.Adder.html
+share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Sets.DelayedValue.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Sets.Discarder.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Sets.Literal.html
 share/cassandra/javadoc/org/apache/cassandra/cql3/class-use/Sets.Marker.html
@@ -635,6 +645,8 @@ share/cassandra/javadoc/org/apache/cassandra/db/RangeSliceReply.html
 share/cassandra/javadoc/org/apache/cassandra/db/RangeTombstone.Serializer.html
 share/cassandra/javadoc/org/apache/cassandra/db/RangeTombstone.Tracker.html
 share/cassandra/javadoc/org/apache/cassandra/db/RangeTombstone.html
+share/cassandra/javadoc/org/apache/cassandra/db/RangeTombstoneList.Serializer.html
+share/cassandra/javadoc/org/apache/cassandra/db/RangeTombstoneList.html
 share/cassandra/javadoc/org/apache/cassandra/db/ReadCommand.html
 share/cassandra/javadoc/org/apache/cassandra/db/ReadRepairVerbHandler.html
 share/cassandra/javadoc/org/apache/cassandra/db/ReadResponse.html
@@ -732,6 +744,8 @@ share/cassandra/javadoc/org/apache/cassandra/db/class-use/RangeSliceReply.html
 share/cassandra/javadoc/org/apache/cassandra/db/class-use/RangeTombstone.Serializer.html
 share/cassandra/javadoc/org/apache/cassandra/db/class-use/RangeTombstone.Tracker.html
 share/cassandra/javadoc/org/apache/cassandra/db/class-use/RangeTombstone.html
+share/cassandra/javadoc/org/apache/cassandra/db/class-use/RangeTombstoneList.Serializer.html
+share/cassandra/javadoc/org/apache/cassandra/db/class-use/RangeTombstoneList.html
 share/cassandra/javadoc/org/apache/cassandra/db/class-use/ReadCommand.html
 share/cassandra/javadoc/org/apache/cassandra/db/class-use/ReadRepairVerbHandler.html
 share/cassandra/javadoc/org/apache/cassandra/db/class-use/ReadResponse.html
@@ -842,8 +856,13 @@ share/cassandra/javadoc/org/apache/cassandra/db/compaction/LeveledManifest.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/OperationType.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/ParallelCompactionIterable.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/PrecompactedRow.html
+share/cassandra/javadoc/org/apache/cassandra/db/compaction/SSTableSplitter.SplitController.html
+share/cassandra/javadoc/org/apache/cassandra/db/compaction/SSTableSplitter.SplittingCompactionTask.html
+share/cassandra/javadoc/org/apache/cassandra/db/compaction/SSTableSplitter.StatsCollector.html
+share/cassandra/javadoc/org/apache/cassandra/db/compaction/SSTableSplitter.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/Scrubber.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.html
+share/cassandra/javadoc/org/apache/cassandra/db/compaction/Upgrader.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/AbstractCompactedRow.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/AbstractCompactionIterable.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/AbstractCompactionStrategy.html
@@ -866,8 +885,13 @@ share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/LeveledMani
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/OperationType.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/ParallelCompactionIterable.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/PrecompactedRow.html
+share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/SSTableSplitter.SplitController.html
+share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/SSTableSplitter.SplittingCompactionTask.html
+share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/SSTableSplitter.StatsCollector.html
+share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/SSTableSplitter.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/Scrubber.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/SizeTieredCompactionStrategy.html
+share/cassandra/javadoc/org/apache/cassandra/db/compaction/class-use/Upgrader.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/package-frame.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/db/compaction/package-tree.html
@@ -1188,30 +1212,56 @@ share/cassandra/javadoc/org/apache/cassandra/gms/package-frame.html
 share/cassandra/javadoc/org/apache/cassandra/gms/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/gms/package-tree.html
 share/cassandra/javadoc/org/apache/cassandra/gms/package-use.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/AbstractColumnFamilyRecordWriter.AbstractRangeClient.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/AbstractColumnFamilyRecordWriter.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/BulkOutputFormat.NullOutputCommitter.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/BulkOutputFormat.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.html
-share/cassandra/javadoc/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.NullOutputCommitter.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/ColumnFamilySplit.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/ConfigHelper.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/Progressable.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/class-use/AbstractColumnFamilyInputFormat.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/class-use/AbstractColumnFamilyOutputFormat.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/class-use/AbstractColumnFamilyRecordWriter.AbstractRangeClient.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/class-use/AbstractColumnFamilyRecordWriter.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/class-use/BulkOutputFormat.NullOutputCommitter.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/class-use/BulkOutputFormat.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/class-use/ColumnFamilyInputFormat.html
-share/cassandra/javadoc/org/apache/cassandra/hadoop/class-use/ColumnFamilyOutputFormat.NullOutputCommitter.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/class-use/ColumnFamilyOutputFormat.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/class-use/ColumnFamilyRecordReader.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/class-use/ColumnFamilySplit.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/class-use/ConfigHelper.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/class-use/Progressable.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/cql3/CqlPagingInputFormat.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/cql3/class-use/CqlConfigHelper.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/cql3/class-use/CqlOutputFormat.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/cql3/class-use/CqlPagingInputFormat.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/cql3/class-use/CqlPagingRecordReader.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/cql3/package-frame.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/cql3/package-summary.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/cql3/package-tree.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/cql3/package-use.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/package-frame.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/package-tree.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/package-use.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.CfInfo.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.MarshallerType.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/pig/CassandraStorage.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/pig/CqlStorage.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/pig/class-use/AbstractCassandraStorage.CfInfo.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/pig/class-use/AbstractCassandraStorage.MarshallerType.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/pig/class-use/AbstractCassandraStorage.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/pig/class-use/CassandraStorage.html
+share/cassandra/javadoc/org/apache/cassandra/hadoop/pig/class-use/CqlStorage.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/pig/package-frame.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/pig/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/hadoop/pig/package-tree.html
@@ -1235,6 +1285,7 @@ share/cassandra/javadoc/org/apache/cassandra/io/class-use/IVersionedSerializer.h
 share/cassandra/javadoc/org/apache/cassandra/io/compress/CompressedRandomAccessReader.html
 share/cassandra/javadoc/org/apache/cassandra/io/compress/CompressedSequentialWriter.CompressedFileWriterMark.html
 share/cassandra/javadoc/org/apache/cassandra/io/compress/CompressedSequentialWriter.html
+share/cassandra/javadoc/org/apache/cassandra/io/compress/CompressedThrottledReader.html
 share/cassandra/javadoc/org/apache/cassandra/io/compress/CompressionMetadata.Chunk.html
 share/cassandra/javadoc/org/apache/cassandra/io/compress/CompressionMetadata.Writer.html
 share/cassandra/javadoc/org/apache/cassandra/io/compress/CompressionMetadata.html
@@ -1248,6 +1299,7 @@ share/cassandra/javadoc/org/apache/cassandra/io/compress/SnappyCompressor.html
 share/cassandra/javadoc/org/apache/cassandra/io/compress/class-use/CompressedRandomAccessReader.html
 share/cassandra/javadoc/org/apache/cassandra/io/compress/class-use/CompressedSequentialWriter.CompressedFileWriterMark.html
 share/cassandra/javadoc/org/apache/cassandra/io/compress/class-use/CompressedSequentialWriter.html
+share/cassandra/javadoc/org/apache/cassandra/io/compress/class-use/CompressedThrottledReader.html
 share/cassandra/javadoc/org/apache/cassandra/io/compress/class-use/CompressionMetadata.Chunk.html
 share/cassandra/javadoc/org/apache/cassandra/io/compress/class-use/CompressionMetadata.Writer.html
 share/cassandra/javadoc/org/apache/cassandra/io/compress/class-use/CompressionMetadata.html
@@ -1278,6 +1330,7 @@ share/cassandra/javadoc/org/apache/cassandra/io/sstable/IndexHelper.IndexInfo.ht
 share/cassandra/javadoc/org/apache/cassandra/io/sstable/IndexHelper.html
 share/cassandra/javadoc/org/apache/cassandra/io/sstable/IndexSummary.IndexSummarySerializer.html
 share/cassandra/javadoc/org/apache/cassandra/io/sstable/IndexSummary.html
+share/cassandra/javadoc/org/apache/cassandra/io/sstable/IndexSummaryBuilder.html
 share/cassandra/javadoc/org/apache/cassandra/io/sstable/KeyIterator.html
 share/cassandra/javadoc/org/apache/cassandra/io/sstable/ReducingKeyIterator.html
 share/cassandra/javadoc/org/apache/cassandra/io/sstable/SSTable.html
@@ -1311,6 +1364,7 @@ share/cassandra/javadoc/org/apache/cassandra/io/sstable/class-use/IndexHelper.In
 share/cassandra/javadoc/org/apache/cassandra/io/sstable/class-use/IndexHelper.html
 share/cassandra/javadoc/org/apache/cassandra/io/sstable/class-use/IndexSummary.IndexSummarySerializer.html
 share/cassandra/javadoc/org/apache/cassandra/io/sstable/class-use/IndexSummary.html
+share/cassandra/javadoc/org/apache/cassandra/io/sstable/class-use/IndexSummaryBuilder.html
 share/cassandra/javadoc/org/apache/cassandra/io/sstable/class-use/KeyIterator.html
 share/cassandra/javadoc/org/apache/cassandra/io/sstable/class-use/ReducingKeyIterator.html
 share/cassandra/javadoc/org/apache/cassandra/io/sstable/class-use/SSTable.html
@@ -1338,9 +1392,13 @@ share/cassandra/javadoc/org/apache/cassandra/io/sstable/package-tree.html
 share/cassandra/javadoc/org/apache/cassandra/io/sstable/package-use.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/AbstractDataInput.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/AbstractDataOutput.html
+share/cassandra/javadoc/org/apache/cassandra/io/util/BufferedPoolingSegmentedFile.Builder.html
+share/cassandra/javadoc/org/apache/cassandra/io/util/BufferedPoolingSegmentedFile.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/BufferedSegmentedFile.Builder.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/BufferedSegmentedFile.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/ColumnSortedMap.html
+share/cassandra/javadoc/org/apache/cassandra/io/util/CompressedPoolingSegmentedFile.Builder.html
+share/cassandra/javadoc/org/apache/cassandra/io/util/CompressedPoolingSegmentedFile.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/CompressedSegmentedFile.Builder.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/CompressedSegmentedFile.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/DataOutputBuffer.html
@@ -1350,6 +1408,7 @@ share/cassandra/javadoc/org/apache/cassandra/io/util/FastByteArrayOutputStream.h
 share/cassandra/javadoc/org/apache/cassandra/io/util/FileDataInput.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/FileMark.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/FileUtils.html
+share/cassandra/javadoc/org/apache/cassandra/io/util/ICompressedFile.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/IIterableColumns.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/LengthAvailableInputStream.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/MappedFileDataInput.html
@@ -1364,11 +1423,16 @@ share/cassandra/javadoc/org/apache/cassandra/io/util/SegmentedFile.Builder.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/SegmentedFile.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/SequentialWriter.BufferedFileWriterMark.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/SequentialWriter.html
+share/cassandra/javadoc/org/apache/cassandra/io/util/ThrottledReader.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/AbstractDataInput.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/AbstractDataOutput.html
+share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/BufferedPoolingSegmentedFile.Builder.html
+share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/BufferedPoolingSegmentedFile.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/BufferedSegmentedFile.Builder.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/BufferedSegmentedFile.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/ColumnSortedMap.html
+share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/CompressedPoolingSegmentedFile.Builder.html
+share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/CompressedPoolingSegmentedFile.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/CompressedSegmentedFile.Builder.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/CompressedSegmentedFile.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/DataOutputBuffer.html
@@ -1378,6 +1442,7 @@ share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/FastByteArrayOutp
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/FileDataInput.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/FileMark.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/FileUtils.html
+share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/ICompressedFile.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/IIterableColumns.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/LengthAvailableInputStream.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/MappedFileDataInput.html
@@ -1392,6 +1457,7 @@ share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/SegmentedFile.Bui
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/SegmentedFile.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/SequentialWriter.BufferedFileWriterMark.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/SequentialWriter.html
+share/cassandra/javadoc/org/apache/cassandra/io/util/class-use/ThrottledReader.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/package-frame.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/io/util/package-tree.html
@@ -1413,6 +1479,7 @@ share/cassandra/javadoc/org/apache/cassandra/locator/NetworkTopologyStrategy.htm
 share/cassandra/javadoc/org/apache/cassandra/locator/OldNetworkTopologyStrategy.html
 share/cassandra/javadoc/org/apache/cassandra/locator/PropertyFileSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/RackInferringSnitch.html
+share/cassandra/javadoc/org/apache/cassandra/locator/ReconnectableSnitchHelper.html
 share/cassandra/javadoc/org/apache/cassandra/locator/SeedProvider.html
 share/cassandra/javadoc/org/apache/cassandra/locator/SimpleSeedProvider.html
 share/cassandra/javadoc/org/apache/cassandra/locator/SimpleSnitch.html
@@ -1437,6 +1504,7 @@ share/cassandra/javadoc/org/apache/cassandra/locator/class-use/NetworkTopologySt
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/OldNetworkTopologyStrategy.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/PropertyFileSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/RackInferringSnitch.html
+share/cassandra/javadoc/org/apache/cassandra/locator/class-use/ReconnectableSnitchHelper.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/SeedProvider.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/SimpleSeedProvider.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/SimpleSnitch.html
@@ -1449,30 +1517,36 @@ share/cassandra/javadoc/org/apache/cassandra/locator/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/locator/package-tree.html
 share/cassandra/javadoc/org/apache/cassandra/locator/package-use.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/CacheMetrics.html
+share/cassandra/javadoc/org/apache/cassandra/metrics/ClientMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/ClientRequestMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/ColumnFamilyMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/CommitLogMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/CompactionMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/ConnectionMetrics.html
+share/cassandra/javadoc/org/apache/cassandra/metrics/DefaultNameFactory.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/DroppedMessageMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/HintedHandoffMetrics.DifferencingCounter.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/HintedHandoffMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/LatencyMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/MetricNameFactory.html
+share/cassandra/javadoc/org/apache/cassandra/metrics/ReadRepairMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/StorageMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/StreamingMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/ThreadPoolMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/CacheMetrics.html
+share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/ClientMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/ClientRequestMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/ColumnFamilyMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/CommitLogMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/CompactionMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/ConnectionMetrics.html
+share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/DefaultNameFactory.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/DroppedMessageMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/HintedHandoffMetrics.DifferencingCounter.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/HintedHandoffMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/LatencyMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/MetricNameFactory.html
+share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/ReadRepairMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/StorageMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/StreamingMetrics.html
 share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/ThreadPoolMetrics.html
@@ -1529,10 +1603,12 @@ share/cassandra/javadoc/org/apache/cassandra/net/sink/package-use.html
 share/cassandra/javadoc/org/apache/cassandra/notifications/INotification.html
 share/cassandra/javadoc/org/apache/cassandra/notifications/INotificationConsumer.html
 share/cassandra/javadoc/org/apache/cassandra/notifications/SSTableAddedNotification.html
+share/cassandra/javadoc/org/apache/cassandra/notifications/SSTableDeletingNotification.html
 share/cassandra/javadoc/org/apache/cassandra/notifications/SSTableListChangedNotification.html
 share/cassandra/javadoc/org/apache/cassandra/notifications/class-use/INotification.html
 share/cassandra/javadoc/org/apache/cassandra/notifications/class-use/INotificationConsumer.html
 share/cassandra/javadoc/org/apache/cassandra/notifications/class-use/SSTableAddedNotification.html
+share/cassandra/javadoc/org/apache/cassandra/notifications/class-use/SSTableDeletingNotification.html
 share/cassandra/javadoc/org/apache/cassandra/notifications/class-use/SSTableListChangedNotification.html
 share/cassandra/javadoc/org/apache/cassandra/notifications/package-frame.html
 share/cassandra/javadoc/org/apache/cassandra/notifications/package-summary.html
@@ -1591,9 +1667,12 @@ share/cassandra/javadoc/org/apache/cassandra/service/IndexScanVerbHandler.html
 share/cassandra/javadoc/org/apache/cassandra/service/LoadBroadcaster.html
 share/cassandra/javadoc/org/apache/cassandra/service/MigrationManager.MigrationsSerializer.html
 share/cassandra/javadoc/org/apache/cassandra/service/MigrationManager.html
+share/cassandra/javadoc/org/apache/cassandra/service/NativeAccessMBean.html
 share/cassandra/javadoc/org/apache/cassandra/service/PBSPredictionResult.html
 share/cassandra/javadoc/org/apache/cassandra/service/PBSPredictor.html
 share/cassandra/javadoc/org/apache/cassandra/service/PBSPredictorMBean.html
+share/cassandra/javadoc/org/apache/cassandra/service/PendingRangeCalculatorService.html
+share/cassandra/javadoc/org/apache/cassandra/service/PendingRangeCalculatorServiceMBean.html
 share/cassandra/javadoc/org/apache/cassandra/service/QueryState.html
 share/cassandra/javadoc/org/apache/cassandra/service/RangeSliceResponseResolver.html
 share/cassandra/javadoc/org/apache/cassandra/service/RangeSliceVerbHandler.html
@@ -1644,9 +1723,12 @@ share/cassandra/javadoc/org/apache/cassandra/service/class-use/IndexScanVerbHand
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/LoadBroadcaster.html
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/MigrationManager.MigrationsSerializer.html
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/MigrationManager.html
+share/cassandra/javadoc/org/apache/cassandra/service/class-use/NativeAccessMBean.html
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/PBSPredictionResult.html
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/PBSPredictor.html
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/PBSPredictorMBean.html
+share/cassandra/javadoc/org/apache/cassandra/service/class-use/PendingRangeCalculatorService.html
+share/cassandra/javadoc/org/apache/cassandra/service/class-use/PendingRangeCalculatorServiceMBean.html
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/QueryState.html
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/RangeSliceResponseResolver.html
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/RangeSliceVerbHandler.html
@@ -1737,6 +1819,7 @@ share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.AsyncClient.batch_
 share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.AsyncClient.describe_cluster_name_call.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.AsyncClient.describe_keyspace_call.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.AsyncClient.describe_keyspaces_call.html
+share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.AsyncClient.describe_local_ring_call.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.AsyncClient.describe_partitioner_call.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.AsyncClient.describe_ring_call.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.AsyncClient.describe_schema_versions_call.html
@@ -1803,6 +1886,10 @@ share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.describe_keyspaces
 share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.describe_keyspaces_args.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.describe_keyspaces_result._Fields.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.describe_keyspaces_result.html
+share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.describe_local_ring_args._Fields.html
+share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.describe_local_ring_args.html
+share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.describe_local_ring_result._Fields.html
+share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.describe_local_ring_result.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.describe_partitioner_args._Fields.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.describe_partitioner_args.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/Cassandra.describe_partitioner_result._Fields.html
@@ -2054,6 +2141,7 @@ share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.AsyncCli
 share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.AsyncClient.describe_cluster_name_call.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.AsyncClient.describe_keyspace_call.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.AsyncClient.describe_keyspaces_call.html
+share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.AsyncClient.describe_local_ring_call.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.AsyncClient.describe_partitioner_call.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.AsyncClient.describe_ring_call.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.AsyncClient.describe_schema_versions_call.html
@@ -2120,6 +2208,10 @@ share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.describe
 share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.describe_keyspaces_args.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.describe_keyspaces_result._Fields.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.describe_keyspaces_result.html
+share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.describe_local_ring_args._Fields.html
+share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.describe_local_ring_args.html
+share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.describe_local_ring_result._Fields.html
+share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.describe_local_ring_result.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.describe_partitioner_args._Fields.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.describe_partitioner_args.html
 share/cassandra/javadoc/org/apache/cassandra/thrift/class-use/Cassandra.describe_partitioner_result._Fields.html
@@ -2375,6 +2467,8 @@ share/cassandra/javadoc/org/apache/cassandra/tools/SSTableImport.html
 share/cassandra/javadoc/org/apache/cassandra/tools/SSTableMetadataViewer.html
 share/cassandra/javadoc/org/apache/cassandra/tools/Shuffle.html
 share/cassandra/javadoc/org/apache/cassandra/tools/StandaloneScrubber.html
+share/cassandra/javadoc/org/apache/cassandra/tools/StandaloneSplitter.html
+share/cassandra/javadoc/org/apache/cassandra/tools/StandaloneUpgrader.html
 share/cassandra/javadoc/org/apache/cassandra/tools/class-use/AbstractJmxClient.html
 share/cassandra/javadoc/org/apache/cassandra/tools/class-use/BulkLoader.CmdLineOptions.html
 share/cassandra/javadoc/org/apache/cassandra/tools/class-use/BulkLoader.html
@@ -2388,12 +2482,16 @@ share/cassandra/javadoc/org/apache/cassandra/tools/class-use/SSTableImport.html
 share/cassandra/javadoc/org/apache/cassandra/tools/class-use/SSTableMetadataViewer.html
 share/cassandra/javadoc/org/apache/cassandra/tools/class-use/Shuffle.html
 share/cassandra/javadoc/org/apache/cassandra/tools/class-use/StandaloneScrubber.html
+share/cassandra/javadoc/org/apache/cassandra/tools/class-use/StandaloneSplitter.html
+share/cassandra/javadoc/org/apache/cassandra/tools/class-use/StandaloneUpgrader.html
 share/cassandra/javadoc/org/apache/cassandra/tools/package-frame.html
 share/cassandra/javadoc/org/apache/cassandra/tools/package-summary.html
 share/cassandra/javadoc/org/apache/cassandra/tools/package-tree.html
 share/cassandra/javadoc/org/apache/cassandra/tools/package-use.html
+share/cassandra/javadoc/org/apache/cassandra/tracing/ExpiredTraceState.html
 share/cassandra/javadoc/org/apache/cassandra/tracing/TraceState.html
 share/cassandra/javadoc/org/apache/cassandra/tracing/Tracing.html
+share/cassandra/javadoc/org/apache/cassandra/tracing/class-use/ExpiredTraceState.html
 share/cassandra/javadoc/org/apache/cassandra/tracing/class-use/TraceState.html
 share/cassandra/javadoc/org/apache/cassandra/tracing/class-use/Tracing.html
 share/cassandra/javadoc/org/apache/cassandra/tracing/package-frame.html
@@ -2581,6 +2679,8 @@ share/cassandra/javadoc/org/apache/cassandra/utils/Murmur3BloomFilter.Murmur3Blo
 share/cassandra/javadoc/org/apache/cassandra/utils/Murmur3BloomFilter.html
 share/cassandra/javadoc/org/apache/cassandra/utils/MurmurHash.html
 share/cassandra/javadoc/org/apache/cassandra/utils/Mx4jTool.html
+share/cassandra/javadoc/org/apache/cassandra/utils/ObjectSizes.MemoryLayoutSpecification.html
+share/cassandra/javadoc/org/apache/cassandra/utils/ObjectSizes.html
 share/cassandra/javadoc/org/apache/cassandra/utils/OutputHandler.LogOutput.html
 share/cassandra/javadoc/org/apache/cassandra/utils/OutputHandler.SystemOutput.html
 share/cassandra/javadoc/org/apache/cassandra/utils/OutputHandler.html
@@ -2648,6 +2748,8 @@ share/cassandra/javadoc/org/apache/cassandra/utils/class-use/Murmur3BloomFilter.
 share/cassandra/javadoc/org/apache/cassandra/utils/class-use/Murmur3BloomFilter.html
 share/cassandra/javadoc/org/apache/cassandra/utils/class-use/MurmurHash.html
 share/cassandra/javadoc/org/apache/cassandra/utils/class-use/Mx4jTool.html
+share/cassandra/javadoc/org/apache/cassandra/utils/class-use/ObjectSizes.MemoryLayoutSpecification.html
+share/cassandra/javadoc/org/apache/cassandra/utils/class-use/ObjectSizes.html
 share/cassandra/javadoc/org/apache/cassandra/utils/class-use/OutputHandler.LogOutput.html
 share/cassandra/javadoc/org/apache/cassandra/utils/class-use/OutputHandler.SystemOutput.html
 share/cassandra/javadoc/org/apache/cassandra/utils/class-use/OutputHandler.html
@@ -2694,7 +2796,10 @@ share/cassandra/javadoc/overview-frame.html
 share/cassandra/javadoc/overview-summary.html
 share/cassandra/javadoc/overview-tree.html
 share/cassandra/javadoc/package-list
-share/cassandra/javadoc/resources/inherit.gif
+share/cassandra/javadoc/resources/background.gif
+share/cassandra/javadoc/resources/tab.gif
+share/cassandra/javadoc/resources/titlebar.gif
+share/cassandra/javadoc/resources/titlebar_end.gif
 share/cassandra/javadoc/serialized-form.html
 share/cassandra/javadoc/stylesheet.css
 share/cassandra/lib/antlr-3.2.jar
@@ -2708,7 +2813,7 @@ share/cassandra/lib/commons-codec-1.2.jar
 share/cassandra/lib/commons-lang-2.6.jar
 share/cassandra/lib/compress-lzf-0.8.4.jar
 share/cassandra/lib/concurrentlinkedhashmap-lru-1.3.jar
-share/cassandra/lib/cql-internal-only-1.4.0.zip
+share/cassandra/lib/cql-internal-only-1.4.1.zip
 share/cassandra/lib/guava-13.0.1.jar
 share/cassandra/lib/high-scale-lib-1.1.2.jar
 share/cassandra/lib/jackson-core-asl-1.9.2.jar
@@ -2722,7 +2827,6 @@ share/cassandra/lib/licenses/antlr-3.2.txt
 share/cassandra/lib/licenses/avro-1.4.0.txt
 share/cassandra/lib/licenses/commons-cli-1.1.txt
 share/cassandra/lib/licenses/commons-codec-1.2.txt
-share/cassandra/lib/licenses/commons-collections-3.2.1.txt
 share/cassandra/lib/licenses/commons-lang-2.6.txt
 share/cassandra/lib/licenses/compress-lzf-0.8.4.txt
 share/cassandra/lib/licenses/concurrentlinkedhashmap-lru-1.3.txt
@@ -2733,14 +2837,14 @@ share/cassandra/lib/licenses/jackson-core-asl-1.9.2.txt
 share/cassandra/lib/licenses/jackson-mapper-asl-1.9.2.txt
 share/cassandra/lib/licenses/jamm-0.2.5.txt
 share/cassandra/lib/licenses/jbcrypt-0.3m.txt
-share/cassandra/lib/licenses/jetty-6.1.21.txt
-share/cassandra/lib/licenses/jetty-util-6.1.21.txt
 share/cassandra/lib/licenses/jline-1.0.txt
 share/cassandra/lib/licenses/json-simple-1.1.txt
 share/cassandra/lib/licenses/libthrift-0.7.txt
 share/cassandra/lib/licenses/log4j-1.2.16.txt
 share/cassandra/lib/licenses/lz4-1.1.0.txt
+share/cassandra/lib/licenses/metrics-core-2.2.0.txt
 share/cassandra/lib/licenses/netty-3.5.2.txt
+share/cassandra/lib/licenses/netty-3.6.6.txt
 share/cassandra/lib/licenses/servlet-api-2.5-20081211.txt
 share/cassandra/lib/licenses/slf4j-api-1.6.1.txt
 share/cassandra/lib/licenses/slf4j-log4j12-1.6.1.txt
@@ -2750,13 +2854,13 @@ share/cassandra/lib/licenses/snaptree-0.1.txt
 share/cassandra/lib/licenses/thrift-python-0.7.0.txt
 share/cassandra/lib/log4j-1.2.16.jar
 share/cassandra/lib/lz4-1.1.0.jar
-share/cassandra/lib/metrics-core-2.0.3.jar
-share/cassandra/lib/netty-3.5.9.Final.jar
+share/cassandra/lib/metrics-core-2.2.0.jar
+share/cassandra/lib/netty-3.6.6.Final.jar
 share/cassandra/lib/servlet-api-2.5-20081211.jar
 share/cassandra/lib/slf4j-api-1.7.2.jar
 share/cassandra/lib/slf4j-log4j12-1.7.2.jar
 share/cassandra/lib/snakeyaml-1.6.jar
-share/cassandra/lib/snappy-java-1.0.4.1.jar
+share/cassandra/lib/snappy-java-1.0.5.jar
 share/cassandra/lib/snaptree-0.1.jar
 share/cassandra/lib/thrift-python-internal-only-0.7.0.zip
 share/cassandra/pylib/cqlshlib/__init__.py
diff --git a/databases/apache-cassandra/distinfo b/databases/apache-cassandra/distinfo
index 5e6ee7111d2..646173bb244 100644
--- a/databases/apache-cassandra/distinfo
+++ b/databases/apache-cassandra/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2013/04/29 11:16:39 fhajny Exp $
+$NetBSD: distinfo,v 1.8 2014/02/14 10:25:23 fhajny Exp $
 
-SHA1 (apache-cassandra-1.2.4-bin.tar.gz) = fa04ea0616e2749f5368c9e977b7ffa17d586bdc
-RMD160 (apache-cassandra-1.2.4-bin.tar.gz) = 64a796c2814e04b8ea82e2457bffa0b907e79931
-Size (apache-cassandra-1.2.4-bin.tar.gz) = 16289571 bytes
+SHA1 (apache-cassandra-1.2.15-bin.tar.gz) = 717487325aab8df2c1ca0da71d567e0ea656733c
+RMD160 (apache-cassandra-1.2.15-bin.tar.gz) = 8f90f2062940b6abe37eba5733034d067d8c5b60
+Size (apache-cassandra-1.2.15-bin.tar.gz) = 16877671 bytes