Update databases/apache-cassandra to 1.2.19, the last version released

on the 1.x branch. Set up Makefile.common to be used by newer versions.

1.2.19
 * Don't index tombstones
 * Don't allow compacted sstables to be marked as compacting
 * Track expired tombstones
 * Validate empty cell names from counter updates
 * Improve PasswordAuthenticator default super user setup
 * Remove duplicates from StorageService.getJoiningNodes
 * Clone token map outside of hot gossip loops
 * Add stop method to EmbeddedCassandraService
 * Support connecting to ipv6 jmx with nodetool
 * Set gc_grace_seconds to seven days for system schema tables
 * SimpleSeedProvider no longer caches seeds forever
 * Set correct stream ID on responses when non-Exception Throwables
   are thrown while handling native protocol messages
 * Fix row size miscalculation in LazilyCompactedRow
 * Fix race in background compaction check
 * Don't clear out range tombstones during compaction

1.2.18
 * Support Thrift tables clustering columns on CqlPagingInputFormat
 * Fix compilation with java 6 broke by CASSANDRA-7147

1.2.17
 * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output
 * Expose global ColumnFamily metrics
 * Handle possible integer overflow in FastByteArrayOutputStream
 * cqlsh: 'ascii' values weren't formatted as text
 * cqlsh: ignore .cassandra permission errors
 * reduce failure detector initial value to 2s
 * Fix problem truncating on a node that was previously in a dead state
 * Don't insert tombstones that hide indexed values into 2i
 * Track metrics at a keyspace level
 * Add replace_address_first_boot flag to only replace if not bootstrapped
 * Enable keepalive for native protocol
 * Check internal addresses for seeds
 * Fix potential / by 0 in HHOM page size calculation
 * Fix handling of empty counter replication mutations
 * Use LOCAL_ONE for non-superuser auth queries
 * Set keepalive on MessagingService connections
 * Add Cloudstack snitch
 * Update system.peers correctly when relocating tokens
 * Add Google Compute Engine snitch
 * Fix nodetool display with vnodes
 * Fix schema concurrency exceptions
 * Fix BatchlogManager#deleteBatch() use of millisecond timsestamps
 * Continue assassinating even if the endpoint vanishes
 * Schedule schema pulls on change
 * Non-droppable verbs shouldn't be dropped from OTC
 * Shutdown batchlog executor in SS#drain()
 * Fix batchlog to account for CF truncation records
 * Fix CQLSH parsing of functions and BLOB literals
 * Require nodetool rebuild_index to specify index names
 * Ensure that batchlog and hint timeouts do not produce hints
 * Don't shut MessagingService down when replacing a node
 * Always clean up references in SerializingCache
 * fix npe when doing -Dcassandra.fd_initial_value_ms
 * Preserves CQL metadata when updating table from thrift
 * fix time conversion to milliseconds in SimpleCondition.await
 * remove duplicate query for local tokens
 * raise streaming phi convict threshold level
 * reduce garbage creation in calculatePendingRanges
 * exit CQLSH with error status code if script fails
 * Fix bug with some IN queries missig results
 * Fix availability validation for LOCAL_ONE CL
 * Hint streaming can cause decommission to fail
 * RepairTask didn't send a correct message on IllegalArgumentException
 * Fix race in Thrift server that can exhaust the pool of worker threads

4 files changed, 129 insertions, 111 deletions

diff --git a/databases/apache-cassandra/Makefile b/databases/apache-cassandra/Makefile
index 1a8f0ef2040..59207f89184 100644
--- a/databases/apache-cassandra/Makefile
+++ b/databases/apache-cassandra/Makefile
@@ -1,107 +1,18 @@
-# $NetBSD: Makefile,v 1.18 2014/05/17 16:10:42 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2015/10/21 12:53:27 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/${PKGVERSION_NOREV}/
-DISTFILES=	${DISTNAME}-bin${EXTRACT_SUFX}
-
-MAINTAINER=	tonnerre@NetBSD.org
-HOMEPAGE=	http://cassandra.apache.org/
-COMMENT=	Highly scalable, distributed structured key-value store
-
-LICENSE=	apache-2.0
-NO_BUILD=	yes
-USE_LANGUAGES=	# none
-USE_JAVA=	run
-USE_JAVA2=	6
-USE_TOOLS+=	pax
-
-PKG_DESTDIR_SUPPORT=	destdir
-
-.include "../../mk/bsd.prefs.mk"
-
-CASSANDRA_VER=	1.2.16
-CASSANDRA_HOME=	${PREFIX}/share/cassandra
-EGDIR=		${PREFIX}/share/examples/cassandra
-DOCDIR=		${PREFIX}/share/doc/cassandra
-
-RCD_SCRIPTS=		cassandra
-SMF_NAME=		cassandra
-CASSANDRA_USER?=	cassandra
-CASSANDRA_GROUP?=	cassandra
-PKG_GROUPS=		${CASSANDRA_GROUP}
-PKG_USERS=		${CASSANDRA_USER}:${CASSANDRA_GROUP}
-PKG_GROUPS_VARS+=	CASSANDRA_GROUP
-PKG_USERS_VARS=		CASSANDRA_USER
-PKG_HOME.cassandra=	${CASSANDRA_HOME}
-PKG_SHELL.cassandra=	${SH}
-
-# Following line only to unlock PKG_SYSCONFDIR_PERMS
-PKG_SYSCONFSUBDIR=		conf
-PKG_SYSCONFVAR=			cassandra
-PKG_SYSCONFDIR.cassandra=	${CASSANDRA_HOME}/${PKG_SYSCONFSUBDIR}
-PKG_SYSCONFDIR_PERMS=		${CASSANDRA_USER} ${CASSANDRA_GROUP} 0755
-
-OWN_DIRS_PERMS+=	${VARBASE}/lib/cassandra ${CASSANDRA_USER} ${CASSANDRA_GROUP} 0751
-OWN_DIRS_PERMS+=	${VARBASE}/log/cassandra ${CASSANDRA_USER} ${CASSANDRA_GROUP} 0755
-
-FILES_SUBST+=		JAVA_HOME=${PKG_JAVA_HOME}		\
-			CASSANDRA_HOME=${CASSANDRA_HOME}	\
-			CASSANDRA_USER=${CASSANDRA_USER}	\
-			CASSANDRA_GROUP=${CASSANDRA_GROUP}
+CASSANDRA_VER=	1.2.19
 
-EGFILES=		cassandra-env.sh cassandra-rackdc.properties	\
-			cassandra-topology.properties cassandra.yaml	\
-			commitlog_archiving.properties cqlshrc.sample	\
-			log4j-server.properties	log4j-tools.properties
-
-DOCFILES=		CHANGES LICENSE NEWS NOTICE README
-
-.for f in ${EGFILES}
-CONF_FILES_PERMS+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
-			${CASSANDRA_USER} ${CASSANDRA_GROUP} 0644
-.endfor
-
-INSTALLATION_DIRS+=	${CASSANDRA_HOME} ${EGDIR} ${DOCDIR}
-
-CHECK_INTERPRETER_SKIP+=share/cassandra/interface/cassandra.thrift
-CHECK_INTERPRETER_SKIP+=share/cassandra/pylib/setup.py
-CHECK_INTERPRETER_SKIP+=share/cassandra/tools/bin/token-generator
-
-do-install:
-.for d in ${WORK_DIRS}
-		${RM} -rf ${WRKSRC}/${d}
-.endfor
-
-.for f in ${DOCFILES}
-		${INSTALL_DATA} ${WRKSRC}/${f}.txt ${DESTDIR}${DOCDIR}/${f}
-		${RM} -f ${WRKSRC}/${f}.txt
-.endfor
-
-.for f in ${EGFILES}
-		${INSTALL_DATA} ${WRKSRC}/conf/${f} ${DESTDIR}${EGDIR}/${f}
-.endfor
-
-	${FIND} ${WRKSRC} -name \*.exe -type f -print | ${XARGS} ${RM} -f
-	${FIND} ${WRKSRC} -name \*.bat -type f -print | ${XARGS} ${RM} -f
-
-	cd ${WRKSRC} && \
-	  ${PAX} -rw -pm bin interface javadoc lib pylib tools \
-	  ${DESTDIR}${CASSANDRA_HOME}
+MASTER_SITES=	http://archive.apache.org/dist/cassandra/${PKGVERSION_NOREV}/
 
-	${FIND} ${DESTDIR}${CASSANDRA_HOME} -type d -print |	\
-		${XARGS} ${CHMOD} ${PKGDIRMODE}
-	${FIND} ${DESTDIR}${CASSANDRA_HOME} -type f -print |	\
-		${XARGS} ${CHMOD} ${SHAREMODE}
-	${FIND} ${DESTDIR}${CASSANDRA_HOME}/bin -type f -print |	\
-		${XARGS} ${CHMOD} ${BINMODE}
-	${FIND} ${DESTDIR}${CASSANDRA_HOME} -type f -name \*.sh -print |	\
-		${XARGS} ${CHMOD} ${BINMODE}
+BINFILES=	cassandra cassandra-cli cassandra.in.sh cqlsh debug-cql		\
+		json2sstable nodetool sstable2json sstablekeys sstableloader	\
+		sstablescrub sstablesplit sstableupgrade stop-server
+DOCFILES=	CHANGES LICENSE NEWS NOTICE README
+EGFILES=	cassandra-env.sh cassandra-rackdc.properties			\
+		cassandra-topology.properties cassandra.yaml			\
+		commitlog_archiving.properties cqlshrc.sample			\
+		log4j-server.properties	log4j-tools.properties
 
-.include "../../lang/python/application.mk"
-.include "../../mk/java-vm.mk"
+.include "../../databases/apache-cassandra/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/apache-cassandra/Makefile.common b/databases/apache-cassandra/Makefile.common
new file mode 100644
index 00000000000..e3e6616647f
--- /dev/null
+++ b/databases/apache-cassandra/Makefile.common
@@ -0,0 +1,103 @@
+# $NetBSD: Makefile.common,v 1.1 2015/10/21 12:53:27 fhajny Exp $
+# used by databases/apache-cassandra/Makefile
+# used by databases/apache-cassandra2/Makefile
+#
+
+DISTNAME=	apache-cassandra-${CASSANDRA_VER}
+CATEGORIES=	databases
+DISTFILES=	${DISTNAME}-bin${EXTRACT_SUFX}
+
+MAINTAINER=	tonnerre@NetBSD.org
+HOMEPAGE=	http://cassandra.apache.org/
+COMMENT=	Highly scalable, distributed structured key-value store
+
+LICENSE=	apache-2.0
+NO_BUILD=	yes
+USE_LANGUAGES=	# none
+USE_JAVA=	run
+USE_JAVA2=	6
+USE_TOOLS+=	bash:run pax
+
+FILESDIR=	${.CURDIR}/../../databases/apache-cassandra/files
+
+.include "../../mk/bsd.prefs.mk"
+
+CASSANDRA_HOME=		${PREFIX}/share/cassandra
+EGDIR=			${PREFIX}/share/examples/cassandra
+DOCDIR=			${PREFIX}/share/doc/cassandra
+
+RCD_SCRIPTS=		cassandra
+SMF_NAME=		cassandra
+CASSANDRA_USER?=	cassandra
+CASSANDRA_GROUP?=	cassandra
+PKG_GROUPS=		${CASSANDRA_GROUP}
+PKG_USERS=		${CASSANDRA_USER}:${CASSANDRA_GROUP}
+PKG_GROUPS_VARS+=	CASSANDRA_GROUP
+PKG_USERS_VARS=		CASSANDRA_USER
+PKG_HOME.cassandra=	${CASSANDRA_HOME}
+PKG_SHELL.cassandra=	${SH}
+
+# Following line only to unlock PKG_SYSCONFDIR_PERMS
+PKG_SYSCONFSUBDIR=	conf
+PKG_SYSCONFVAR=		cass
+PKG_SYSCONFDIR.cass=	${CASSANDRA_HOME}/${PKG_SYSCONFSUBDIR}
+PKG_SYSCONFDIR_PERMS=	${CASSANDRA_USER} ${CASSANDRA_GROUP} 0755
+
+OWN_DIRS_PERMS+=	${VARBASE}/lib/cassandra ${CASSANDRA_USER} ${CASSANDRA_GROUP} 0751
+OWN_DIRS_PERMS+=	${VARBASE}/log/cassandra ${CASSANDRA_USER} ${CASSANDRA_GROUP} 0755
+
+FILES_SUBST+=		JAVA_HOME=${PKG_JAVA_HOME}		\
+			CASSANDRA_HOME=${CASSANDRA_HOME}	\
+			CASSANDRA_USER=${CASSANDRA_USER}	\
+			CASSANDRA_GROUP=${CASSANDRA_GROUP}
+
+SUBST_CLASSES+=		path
+SUBST_STAGE.path=	pre-install
+SUBST_MESSAGE.path=	Fixing default paths
+SUBST_FILES.path=	bin/cassandra.in.sh bin/cassandra
+SUBST_VARS.path=	VARBASE
+
+.for f in ${EGFILES}
+CONF_FILES_PERMS+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
+			${CASSANDRA_USER} ${CASSANDRA_GROUP} 0644
+.endfor
+
+REPLACE_BASH+=		bin/cassandra
+
+INSTALLATION_DIRS+=	${CASSANDRA_HOME} ${EGDIR} ${DOCDIR}
+INSTALLATION_DIRS+=	${CASSANDRA_HOME} ${CASSANDRA_HOME}/bin ${EGDIR} ${DOCDIR}
+
+CHECK_INTERPRETER_SKIP+=share/cassandra/interface/cassandra.thrift
+CHECK_INTERPRETER_SKIP+=share/cassandra/pylib/setup.py
+CHECK_INTERPRETER_SKIP+=share/cassandra/tools/bin/token-generator
+
+do-install:
+.for d in ${WORK_DIRS}
+		${RM} -rf ${WRKSRC}/${d}
+.endfor
+.for f in ${BINFILES}
+		${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${DESTDIR}${CASSANDRA_HOME}/bin/${f}
+.endfor
+.for f in ${DOCFILES}
+		${INSTALL_DATA} ${WRKSRC}/${f}.txt ${DESTDIR}${DOCDIR}/${f}
+		${RM} -f ${WRKSRC}/${f}.txt
+.endfor
+.for f in ${EGFILES}
+		${INSTALL_DATA} ${WRKSRC}/conf/${f} ${DESTDIR}${EGDIR}/${f}
+.endfor
+	${FIND} ${WRKSRC} -name \*.exe -type f -print | ${XARGS} ${RM} -f
+	${FIND} ${WRKSRC} -name \*.bat -type f -print | ${XARGS} ${RM} -f
+	cd ${WRKSRC} && \
+	  ${PAX} -rw -pm interface javadoc lib pylib tools \
+	  ${DESTDIR}${CASSANDRA_HOME}
+	${FIND} ${DESTDIR}${CASSANDRA_HOME} -type d -print |	\
+		${XARGS} ${CHMOD} ${PKGDIRMODE}
+	${FIND} ${DESTDIR}${CASSANDRA_HOME} -type f -print |	\
+		${XARGS} ${CHMOD} ${SHAREMODE}
+	${FIND} ${DESTDIR}${CASSANDRA_HOME}/bin -type f -print |	\
+		${XARGS} ${CHMOD} ${BINMODE}
+	${FIND} ${DESTDIR}${CASSANDRA_HOME} -type f -name \*.sh -print |	\
+		${XARGS} ${CHMOD} ${BINMODE}
+
+.include "../../lang/python/application.mk"
+.include "../../mk/java-vm.mk"
diff --git a/databases/apache-cassandra/PLIST b/databases/apache-cassandra/PLIST
index 38112fd4934..4618498e50b 100644
--- a/databases/apache-cassandra/PLIST
+++ b/databases/apache-cassandra/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2014/03/11 14:05:00 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.11 2015/10/21 12:53:27 fhajny Exp $
 share/cassandra/bin/cassandra
 share/cassandra/bin/cassandra-cli
-share/cassandra/bin/cassandra-shuffle
 share/cassandra/bin/cassandra.in.sh
 share/cassandra/bin/cqlsh
 share/cassandra/bin/debug-cql
@@ -1465,12 +1464,14 @@ share/cassandra/javadoc/org/apache/cassandra/io/util/package-use.html
 share/cassandra/javadoc/org/apache/cassandra/locator/AbstractEndpointSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/AbstractNetworkTopologySnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/AbstractReplicationStrategy.html
+share/cassandra/javadoc/org/apache/cassandra/locator/CloudstackSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/DynamicEndpointSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/DynamicEndpointSnitchMBean.html
 share/cassandra/javadoc/org/apache/cassandra/locator/Ec2MultiRegionSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/Ec2Snitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/EndpointSnitchInfo.html
 share/cassandra/javadoc/org/apache/cassandra/locator/EndpointSnitchInfoMBean.html
+share/cassandra/javadoc/org/apache/cassandra/locator/GoogleCloudSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/GossipingPropertyFileSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/IEndpointSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/ILatencySubscriber.html
@@ -1490,12 +1491,14 @@ share/cassandra/javadoc/org/apache/cassandra/locator/TokenMetadata.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/AbstractEndpointSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/AbstractNetworkTopologySnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/AbstractReplicationStrategy.html
+share/cassandra/javadoc/org/apache/cassandra/locator/class-use/CloudstackSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/DynamicEndpointSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/DynamicEndpointSnitchMBean.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/Ec2MultiRegionSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/Ec2Snitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/EndpointSnitchInfo.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/EndpointSnitchInfoMBean.html
+share/cassandra/javadoc/org/apache/cassandra/locator/class-use/GoogleCloudSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/GossipingPropertyFileSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/IEndpointSnitch.html
 share/cassandra/javadoc/org/apache/cassandra/locator/class-use/ILatencySubscriber.html
@@ -1519,6 +1522,7 @@ 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.ColumnFamilyHistogram.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
@@ -1527,6 +1531,7 @@ 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/KeyspaceMetrics.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
@@ -1536,6 +1541,7 @@ 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.ColumnFamilyHistogram.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
@@ -1544,6 +1550,7 @@ share/cassandra/javadoc/org/apache/cassandra/metrics/class-use/DefaultNameFactor
 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/KeyspaceMetrics.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
@@ -1679,7 +1686,6 @@ share/cassandra/javadoc/org/apache/cassandra/service/RangeSliceVerbHandler.html
 share/cassandra/javadoc/org/apache/cassandra/service/ReadCallback.html
 share/cassandra/javadoc/org/apache/cassandra/service/RowDataResolver.html
 share/cassandra/javadoc/org/apache/cassandra/service/RowDigestResolver.html
-share/cassandra/javadoc/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.html
 share/cassandra/javadoc/org/apache/cassandra/service/SnapshotVerbHandler.html
 share/cassandra/javadoc/org/apache/cassandra/service/StorageProxy.WritePerformer.html
 share/cassandra/javadoc/org/apache/cassandra/service/StorageProxy.html
@@ -1735,7 +1741,6 @@ share/cassandra/javadoc/org/apache/cassandra/service/class-use/RangeSliceVerbHan
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/ReadCallback.html
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/RowDataResolver.html
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/RowDigestResolver.html
-share/cassandra/javadoc/org/apache/cassandra/service/class-use/ScheduledRangeTransferExecutorService.html
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/SnapshotVerbHandler.html
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/StorageProxy.WritePerformer.html
 share/cassandra/javadoc/org/apache/cassandra/service/class-use/StorageProxy.html
@@ -2465,7 +2470,6 @@ share/cassandra/javadoc/org/apache/cassandra/tools/NodeToolHelp.html
 share/cassandra/javadoc/org/apache/cassandra/tools/SSTableExport.html
 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
@@ -2480,7 +2484,6 @@ share/cassandra/javadoc/org/apache/cassandra/tools/class-use/NodeToolHelp.html
 share/cassandra/javadoc/org/apache/cassandra/tools/class-use/SSTableExport.html
 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
diff --git a/databases/apache-cassandra/distinfo b/databases/apache-cassandra/distinfo
index 72e9100309e..d15d24a84c5 100644
--- a/databases/apache-cassandra/distinfo
+++ b/databases/apache-cassandra/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2014/04/07 10:09:33 fhajny Exp $
+$NetBSD: distinfo,v 1.10 2015/10/21 12:53:27 fhajny Exp $
 
-SHA1 (apache-cassandra-1.2.16-bin.tar.gz) = 637d9ecb643f3226bbf510880586f6021cf70d33
-RMD160 (apache-cassandra-1.2.16-bin.tar.gz) = 1cfd4f9bc93279a720bbda228e2bbb6b73e5c5b8
-Size (apache-cassandra-1.2.16-bin.tar.gz) = 16880266 bytes
+SHA1 (apache-cassandra-1.2.19-bin.tar.gz) = e8abb254453a063bda43b17971aba0ca3b9badcd
+RMD160 (apache-cassandra-1.2.19-bin.tar.gz) = 165b18aeccba52a1d0673110bf7d42ce8e8a5fce
+SHA512 (apache-cassandra-1.2.19-bin.tar.gz) = 0e8699ccaa1e6d9885f1a9d4be0892893309a9c8534e1e5700604beb64f892e24b08ba09236a7cb82e182c8e0011e1dc12c7517461e62da6570e1f861ba89fc4
+Size (apache-cassandra-1.2.19-bin.tar.gz) = 16898523 bytes