Attachment 149294 Details for Bug 194698 – Patch for port

[patch] Patch for port

port.patch (text/plain), 18.57 KB, created by admins on 2014-11-11 20:11:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: admins

Created: 2014-11-11 20:11:22 UTC

Size: 18.57 KB

patch

obsolete

>diff -ruN cassandra2/Makefile cassandra2/Makefile
>--- cassandra2/Makefile	2014-09-05 03:30:38.000000000 +0000
>+++ cassandra2/Makefile	2014-10-29 23:29:23.541228456 +0000
>@@ -1,8 +1,7 @@
> # $FreeBSD: head/databases/cassandra2/Makefile 367323 2014-09-05 03:30:38Z pi $
> 
> PORTNAME=	cassandra
>-PORTVERSION=	2.0.10
>-PORTREVISION=	1
>+PORTVERSION=	2.1.1
> CATEGORIES=	databases java
> MASTER_SITES=	APACHE
> MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}
>@@ -23,26 +22,23 @@
> 
> CONFIGS=	cassandra-topology.properties \
> 		cassandra.yaml \
>-		log4j-server.properties \
>-		log4j-tools.properties \
> 		cassandra-rackdc.properties \
> 		commitlog_archiving.properties
> SCRIPTS=	cassandra \
> 		cassandra-cli \
>-		json2sstable \
>+		debug-cql \
> 		nodetool \
>-		sstable2json \
> 		sstablekeys \
> 		sstableloader \
>-		sstablescrub
>+		sstablescrub \
>+		sstableupgrade
> 
> CONFLICTS_INSTALL=	cassandra-1.*
> 
>-OPTIONS_DEFINE=	MX4J JNA CQL DOCS
>+OPTIONS_DEFINE=	MX4J CQL DOCS
> OPTIONS_SUB=	yes
> 
> MX4J_DESC=	Enable HTTP interface for JMX
>-JNA_DESC=	Use JNA native access
> CQL_DESC=	Install cqlsh
> DOCS_DESC=	Install javadoc documentation
> 
>@@ -53,7 +49,6 @@
> RUN_DEPENDS+=	${JAVALIBDIR}/snappy-java.jar:${PORTSDIR}/archivers/snappy-java
> 
> MX4J_RUN_DEPENDS=	${JAVAJARDIR}/mx4j-tools.jar:${PORTSDIR}/java/mx4j
>-JNA_RUN_DEPENDS=	${JAVAJARDIR}/jna.jar:${PORTSDIR}/devel/jna
> CQL_USE=	python=yes
> 
> PORTDOCS=	javadoc *.txt
>@@ -76,13 +71,10 @@
> .endif
> 
> post-patch:
>+.for i in ${SCRIPTS}
> 	${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' \
>-		${WRKSRC}/bin/cassandra-cli \
>-		${WRKSRC}/bin/nodetool \
>-		${WRKSRC}/bin/sstableloader \
>-		${WRKSRC}/bin/sstable2json \
>-		${WRKSRC}/bin/json2sstable \
>-		${WRKSRC}/bin/sstablekeys
>+		${WRKSRC}/bin/${i}
>+.endfor
> 	${REINPLACE_CMD} -e 's|\`dirname \$$\0\`/..|${DATADIR}|' \
> 		${WRKSRC}/bin/cassandra.in.sh
> 	${RM} -f ${WRKSRC}/conf/*.orig
>@@ -105,24 +97,12 @@
> 	${MV} ${STAGEDIR}${DATADIR}/*.txt ${STAGEDIR}${DOCSDIR}
> 	cd ${STAGEDIR}${DATADIR}/bin/ && ${CHMOD} ${BINMODE} ${SCRIPTS}
> 	${INSTALL_SCRIPT} ${WRKDIR}/repaircluster ${STAGEDIR}${DATADIR}/bin
>-	${LN} -sf ${DATADIR}/bin/cassandra-cli ${STAGEDIR}${PREFIX}/bin/cassandra-cli
>-	${LN} -sf ${DATADIR}/bin/nodetool ${STAGEDIR}${PREFIX}/bin/nodetool
>-	${LN} -sf ${DATADIR}/bin/sstableloader ${STAGEDIR}${PREFIX}/bin/sstableloader
>-	${LN} -sf ${DATADIR}/bin/repaircluster ${STAGEDIR}${PREFIX}/bin/repaircluster
>-	${LN} -sf ${DATADIR}/bin/json2sstable ${STAGEDIR}${PREFIX}/bin/json2sstable
>-	${LN} -sf ${DATADIR}/bin/sstable2json ${STAGEDIR}${PREFIX}/bin/sstable2json
>-	${LN} -sf ${DATADIR}/bin/sstablekeys ${STAGEDIR}${PREFIX}/bin/sstablekeys
>-	${LN} -sf ${DATADIR}/bin/sstablescrub ${STAGEDIR}${PREFIX}/bin/sstablescrub
>+.for i in ${SCRIPTS}
>+	${LN} -sf ${DATADIR}/bin/${i} ${STAGEDIR}${PREFIX}/bin/${i}
>+.endfor
> 
>-.if ${PORT_OPTIONS:MCQL}
>-	${LN} -sf ${DATADIR}/bin/cqlsh ${STAGEDIR}${PREFIX}/bin/cqlsh
>-.endif
> .if ${PORT_OPTIONS:MMX4J}
> 	${LN} -sf ${LOCALBASE}/share/java/classes/mx4j-tools.jar ${STAGEDIR}${DATADIR}/lib/mx4j-tools.jar
> .endif
>-.if ${PORT_OPTIONS:MJNA}
>-	${LN} -sf ${LOCALBASE}/share/java/classes/jna.jar ${STAGEDIR}${DATADIR}/lib/jna.jar
>-	${LN} -sf ${LOCALBASE}/share/java/classes/jna-platform.jar ${STAGEDIR}${DATADIR}/lib/jna-platform.jar
>-.endif
> 
> .include <bsd.port.mk>
>diff -ruN cassandra2/distinfo cassandra2/distinfo
>--- cassandra2/distinfo	2014-08-29 07:18:10.000000000 +0000
>+++ cassandra2/distinfo	2014-10-28 19:49:35.401433886 +0000
>@@ -1,2 +1,2 @@
>-SHA256 (apache-cassandra-2.0.10-bin.tar.gz) = 962ab35b1767ed4c56eb9a2a6b9df374097dc48d4f1c718945cab3a977e5d9fa
>-SIZE (apache-cassandra-2.0.10-bin.tar.gz) = 17969861
>+SHA256 (apache-cassandra-2.1.1-bin.tar.gz) = e9d10c2ccc6124d516772e672aef61732f763ff326967dc7fbcc3f1123a29901
>+SIZE (apache-cassandra-2.1.1-bin.tar.gz) = 22748955
>diff -ruN cassandra2/files/cassandra.in cassandra2/files/cassandra.in
>--- cassandra2/files/cassandra.in	2014-08-29 07:18:10.000000000 +0000
>+++ cassandra2/files/cassandra.in	2014-10-29 23:11:48.590776105 +0000
>@@ -53,7 +53,7 @@
> export HEAP_NEWSIZE="$cassandra_newgen"
> export PATH=$PATH:%%LOCALBASE%%/bin
> export CASSANDRA_HOME=%%DATADIR%%
>-export JVM_OPTS=-javaagent:%%DATADIR%%/lib/jamm-0.2.5.jar
>+export JVM_OPTS=-javaagent:%%DATADIR%%/lib/jamm-0.2.6.jar
> export JVM_OVERRIDE_OPTS="$cassandra_vmargs"
> 
> export JAVA_VENDOR=openjdk
>diff -ruN cassandra2/files/patch-env cassandra2/files/patch-env
>--- cassandra2/files/patch-env	2014-09-05 03:30:38.000000000 +0000
>+++ cassandra2/files/patch-env	1970-01-01 00:00:00.000000000 +0000
>@@ -1,12 +0,0 @@
>---- conf/cassandra-env.sh.orig
>-+++ conf/cassandra-env.sh
>-@@ -90,7 +90,7 @@
>- 
>- java_ver_output=`"${JAVA:-java}" -version 2>&1`
>- 
>--jvmver=`echo "$java_ver_output" | grep 'java version' | awk -F'"' 'NR==1 {print $2}'`
>-+jvmver=`echo "$java_ver_output" | egrep 'java version|openjdk version' | awk -F'"' 'NR==1 {print $2}'`
>- JVM_VERSION=${jvmver%_*}
>- JVM_PATCH_VERSION=${jvmver#*_}
>- 
>-
>diff -ruN cassandra2/pkg-deinstall cassandra2/pkg-deinstall
>--- cassandra2/pkg-deinstall	2014-08-29 07:18:10.000000000 +0000
>+++ cassandra2/pkg-deinstall	2014-10-29 22:44:48.008786963 +0000
>@@ -6,7 +6,6 @@
>    if [ ! -d $PKG_PREFIX/share/cassandra/conf ]; then exit 1; fi
>    cd $PKG_PREFIX/share/cassandra/conf
>    for cfgfile in cassandra.yaml commitlog_archiving.properties \
>-		log4j-server.properties log4j-tools.properties \
> 		cassandra-topology.properties cassandra-rackdc.properties;do
>        if cmp -s $cfgfile.sample $cfgfile; then
>           rm $cfgfile
>diff -ruN cassandra2/pkg-install cassandra2/pkg-install
>--- cassandra2/pkg-install	2014-08-29 07:18:10.000000000 +0000
>+++ cassandra2/pkg-install	2014-10-29 22:44:35.248786685 +0000
>@@ -7,7 +7,6 @@
>    umask 027
>    cd $PKG_PREFIX/share/cassandra/conf
>    for cfgfile in cassandra.yaml commitlog_archiving.properties \
>-		log4j-server.properties log4j-tools.properties \
> 		cassandra-topology.properties cassandra-rackdc.properties; do
>        if [ ! -f $cfgfile ]; then
>            cp -p $cfgfile.sample $cfgfile
>diff -ruN cassandra2/pkg-plist cassandra2/pkg-plist
>--- cassandra2/pkg-plist	2014-10-20 10:41:12.000000000 +0000
>+++ cassandra2/pkg-plist	2014-10-29 23:29:09.808728120 +0000
>@@ -1,161 +1,189 @@
>-bin/cassandra-cli
>+@dirrm %%DATADIR%%/bin
>+@dirrm %%DATADIR%%/interface
>+@dirrm %%DATADIR%%/lib
>+@dirrm %%DATADIR%%/tools
>+@dirrmtry %%DATADIR%%
>+@dirrmtry %%DATADIR%%/conf
>+@sample %%DATADIR%%/conf/cassandra-rackdc.properties.sample
>+@sample %%DATADIR%%/conf/cassandra-topology.properties.sample
>+@sample %%DATADIR%%/conf/cassandra.yaml.sample
>+@sample %%DATADIR%%/conf/commitlog_archiving.properties.sample
>+@sample %%DATADIR%%/conf/cqlshrc.sample
>+%%CQL%%@dirrmtry %%DATADIR%%/pylib
>+%%CQL%%%%DATADIR%%/bin/cqlsh
>+%%CQL%%%%DATADIR%%/lib/cassandra-driver-internal-only-2.1.1.post.zip
>+%%CQL%%%%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip
>+%%CQL%%%%DATADIR%%/lib/six-1.7.3-py2.py3-none-any.zip
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/__init__.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/__init__.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/async_insert.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/async_insert.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/cql3handling.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/cql3handling.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/cqlhandling.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/cqlhandling.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/displaying.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/displaying.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/formatting.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/formatting.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/helptopics.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/helptopics.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/meter.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/meter.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/pylexotron.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/pylexotron.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/saferscanner.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/saferscanner.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/sslhandling.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/sslhandling.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/__init__.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/__init__.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/basecase.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/basecase.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/cassconnect.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/cassconnect.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_invocation.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_invocation.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/tracing.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/tracing.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/util.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/util.pyc
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.py
>+%%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.pyc
>+%%CQL%%%%DATADIR%%/pylib/setup.py
>+%%CQL%%%%DATADIR%%/pylib/setup.pyc
> %%CQL%%bin/cqlsh
>-bin/json2sstable
>-bin/nodetool
>-bin/repaircluster
>-bin/sstable2json
>-bin/sstablekeys
>-bin/sstableloader
>-bin/sstablescrub
> %%DATADIR%%/bin/cassandra
> %%DATADIR%%/bin/cassandra-cli
> %%DATADIR%%/bin/cassandra.in.sh
>-%%CQL%%%%DATADIR%%/bin/cqlsh
>+%%DATADIR%%/bin/cassandra.ps1
> %%DATADIR%%/bin/debug-cql
>-%%DATADIR%%/bin/json2sstable
> %%DATADIR%%/bin/nodetool
> %%DATADIR%%/bin/repaircluster
>-%%DATADIR%%/bin/sstable2json
>+%%DATADIR%%/bin/source-conf.ps1
> %%DATADIR%%/bin/sstablekeys
> %%DATADIR%%/bin/sstableloader
> %%DATADIR%%/bin/sstablescrub
>-%%DATADIR%%/bin/sstablesplit
> %%DATADIR%%/bin/sstableupgrade
>-%%DATADIR%%/conf/README.txt
>+%%DATADIR%%/bin/stop-server.ps1
>+%%DATADIR%%/conf/cassandra-env.ps1
> %%DATADIR%%/conf/cassandra-env.sh
>-@sample %%DATADIR%%/conf/cassandra-rackdc.properties.sample
>-@sample %%DATADIR%%/conf/cassandra-topology.properties.sample
> %%DATADIR%%/conf/cassandra-topology.yaml
>-@sample %%DATADIR%%/conf/cassandra.yaml.sample
>-@sample %%DATADIR%%/conf/commitlog_archiving.properties.sample
>-@sample %%DATADIR%%/conf/cqlshrc.sample
>-@sample %%DATADIR%%/conf/log4j-server.properties.sample
>-@sample %%DATADIR%%/conf/log4j-tools.properties.sample
>+%%DATADIR%%/conf/hotspot_compiler
>+%%DATADIR%%/conf/logback-tools.xml
>+%%DATADIR%%/conf/logback.xml
> %%DATADIR%%/conf/metrics-reporter-config-sample.yaml
>+%%DATADIR%%/conf/README.txt
> %%DATADIR%%/conf/triggers/README.txt
> %%DATADIR%%/interface/cassandra.thrift
>-%%DATADIR%%/lib/antlr-3.2.jar
>-%%DATADIR%%/lib/apache-cassandra-2.0.10.jar
>-%%DATADIR%%/lib/apache-cassandra-clientutil-2.0.10.jar
>-%%DATADIR%%/lib/apache-cassandra-thrift-2.0.10.jar
>+%%DATADIR%%/lib/airline-0.6.jar
>+%%DATADIR%%/lib/antlr-runtime-3.5.2.jar
>+%%DATADIR%%/lib/apache-cassandra-2.1.1.jar
>+%%DATADIR%%/lib/apache-cassandra-clientutil-2.1.1.jar
>+%%DATADIR%%/lib/apache-cassandra-thrift-2.1.1.jar
> %%DATADIR%%/lib/commons-cli-1.1.jar
> %%DATADIR%%/lib/commons-codec-1.2.jar
> %%DATADIR%%/lib/commons-lang3-3.1.jar
>+%%DATADIR%%/lib/commons-math3-3.2.jar
> %%DATADIR%%/lib/compress-lzf-0.8.4.jar
>-%%DATADIR%%/lib/concurrentlinkedhashmap-lru-1.3.jar
>-%%CQL%%%%DATADIR%%/lib/cql-internal-only-1.4.1.zip
>+%%DATADIR%%/lib/concurrentlinkedhashmap-lru-1.4.jar
> %%DATADIR%%/lib/disruptor-3.0.1.jar
>-%%DATADIR%%/lib/guava-15.0.jar
>-%%DATADIR%%/lib/high-scale-lib-1.1.2.jar
>+%%DATADIR%%/lib/guava-16.0.jar
>+%%DATADIR%%/lib/high-scale-lib-1.0.6.jar
> %%DATADIR%%/lib/jackson-core-asl-1.9.2.jar
> %%DATADIR%%/lib/jackson-mapper-asl-1.9.2.jar
>-%%DATADIR%%/lib/jamm-0.2.5.jar
>+%%DATADIR%%/lib/jamm-0.2.6.jar
>+%%DATADIR%%/lib/javax.inject.jar
> %%DATADIR%%/lib/jbcrypt-0.3m.jar
> %%DATADIR%%/lib/jline-1.0.jar
>-%%JNA%%%%DATADIR%%/lib/jna-platform.jar
>-%%JNA%%%%DATADIR%%/lib/jna.jar
>+%%DATADIR%%/lib/jna-4.0.0.jar
> %%DATADIR%%/lib/json-simple-1.1.jar
> %%DATADIR%%/lib/libthrift-0.9.1.jar
>-%%DATADIR%%/lib/licenses/antlr-3.2.txt
>+%%DATADIR%%/lib/licenses/airline-0.6.txt
>+%%DATADIR%%/lib/licenses/antlr-runtime-3.5.2.txt
>+%%DATADIR%%/lib/licenses/cassandra-driver-2.1.0b1.post.txt
> %%DATADIR%%/lib/licenses/commons-cli-1.1.txt
> %%DATADIR%%/lib/licenses/commons-codec-1.2.txt
> %%DATADIR%%/lib/licenses/commons-lang3-3.1.txt
>+%%DATADIR%%/lib/licenses/commons-math3-3.2.txt
> %%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt
>-%%DATADIR%%/lib/licenses/concurrentlinkedhashmap-lru-1.3.txt
>-%%DATADIR%%/lib/licenses/cql-1.4.0.txt
>+%%DATADIR%%/lib/licenses/concurrentlinkedhashmap-lru-1.4.txt
> %%DATADIR%%/lib/licenses/disruptor-3.0.1.txt
>-%%DATADIR%%/lib/licenses/guava-15.0.txt
>-%%DATADIR%%/lib/licenses/high-scale-lib-1.1.2.txt
>+%%DATADIR%%/lib/licenses/futures-2.1.6.txt
>+%%DATADIR%%/lib/licenses/guava-16.0.txt
>+%%DATADIR%%/lib/licenses/high-scale-lib-1.0.6.txt
> %%DATADIR%%/lib/licenses/jackson-core-asl-1.9.2.txt
> %%DATADIR%%/lib/licenses/jackson-mapper-asl-1.9.2.txt
>-%%DATADIR%%/lib/licenses/jamm-0.2.5.txt
>+%%DATADIR%%/lib/licenses/jamm-0.2.6.txt
>+%%DATADIR%%/lib/licenses/javax.inject.txt
> %%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt
> %%DATADIR%%/lib/licenses/jline-1.0.txt
>+%%DATADIR%%/lib/licenses/jna-4.0.0.txt
> %%DATADIR%%/lib/licenses/json-simple-1.1.txt
> %%DATADIR%%/lib/licenses/libthrift-0.9.1.txt
>-%%DATADIR%%/lib/licenses/log4j-1.2.16.txt
>+%%DATADIR%%/lib/licenses/logback-classic-1.1.2.txt
>+%%DATADIR%%/lib/licenses/logback-core-1.1.2.txt
> %%DATADIR%%/lib/licenses/lz4-1.2.0.txt
> %%DATADIR%%/lib/licenses/metrics-core-2.2.0.txt
>-%%DATADIR%%/lib/licenses/netty-3.5.9.txt
>-%%DATADIR%%/lib/licenses/netty-3.6.6.txt
>+%%DATADIR%%/lib/licenses/netty-all-4.0.23.Final.txt
> %%DATADIR%%/lib/licenses/reporter-config-2.1.0.txt
>-%%DATADIR%%/lib/licenses/servlet-api-2.5-20081211.txt
>+%%DATADIR%%/lib/licenses/six-1.7.3.txt
> %%DATADIR%%/lib/licenses/slf4j-api-1.7.2.txt
>-%%DATADIR%%/lib/licenses/slf4j-log4j12-1.7.2.txt
> %%DATADIR%%/lib/licenses/snakeyaml-1.11.txt
> %%DATADIR%%/lib/licenses/snappy-java-1.0.5.txt
>-%%DATADIR%%/lib/licenses/snaptree-0.1.txt
>+%%DATADIR%%/lib/licenses/stream-2.5.2.txt
>+%%DATADIR%%/lib/licenses/stringtemplate-4.0.2.txt
> %%DATADIR%%/lib/licenses/super-csv-2.1.0.txt
>-%%DATADIR%%/lib/licenses/thrift-python-0.9.1.txt
>-%%DATADIR%%/lib/licenses/thrift-server-0.3.3.txt
>-%%DATADIR%%/lib/log4j-1.2.16.jar
>+%%DATADIR%%/lib/licenses/thrift-server-0.3.5.txt
>+%%DATADIR%%/lib/logback-classic-1.1.2.jar
>+%%DATADIR%%/lib/logback-core-1.1.2.jar
> %%DATADIR%%/lib/lz4-1.2.0.jar
> %%DATADIR%%/lib/metrics-core-2.2.0.jar
>-%%MX4J%%%%DATADIR%%/lib/mx4j-tools.jar
>-%%DATADIR%%/lib/netty-3.6.6.Final.jar
>+%%DATADIR%%/lib/netty-all-4.0.23.Final.jar
> %%DATADIR%%/lib/reporter-config-2.1.0.jar
>-%%DATADIR%%/lib/servlet-api-2.5-20081211.jar
> %%DATADIR%%/lib/slf4j-api-1.7.2.jar
>-%%DATADIR%%/lib/slf4j-log4j12-1.7.2.jar
> %%DATADIR%%/lib/snakeyaml-1.11.jar
> %%DATADIR%%/lib/snappy-java.jar
>-%%DATADIR%%/lib/snaptree-0.1.jar
>+%%DATADIR%%/lib/stream-2.5.2.jar
>+%%DATADIR%%/lib/stringtemplate-4.0.2.jar
> %%DATADIR%%/lib/super-csv-2.1.0.jar
>-%%CQL%%%%DATADIR%%/lib/thrift-python-internal-only-0.9.1.zip
>-%%DATADIR%%/lib/thrift-server-internal-only-0.3.3.jar
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/__init__.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/__init__.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/cql3handling.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/cql3handling.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/cqlhandling.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/cqlhandling.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/displaying.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/displaying.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/formatting.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/formatting.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/helptopics.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/helptopics.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/pylexotron.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/pylexotron.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/saferscanner.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/saferscanner.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/ssl.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/ssl.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/__init__.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/__init__.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/basecase.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/basecase.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/cassconnect.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/cassconnect.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_invocation.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_invocation.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/tfactory.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/tfactory.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/tracing.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/tracing.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/util.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/util.pyc
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.py
>-%%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.pyc
>-%%CQL%%%%DATADIR%%/pylib/setup.py
>-%%CQL%%%%DATADIR%%/pylib/setup.pyc
>+%%DATADIR%%/lib/thrift-server-0.3.7.jar
> %%DATADIR%%/tools/bin/cassandra-stress
> %%DATADIR%%/tools/bin/cassandra-stressd
> %%DATADIR%%/tools/bin/cassandra.in.sh
>+%%DATADIR%%/tools/bin/json2sstable
>+%%DATADIR%%/tools/bin/sstable2json
> %%DATADIR%%/tools/bin/sstablelevelreset
> %%DATADIR%%/tools/bin/sstablemetadata
>+%%DATADIR%%/tools/bin/sstablerepairedset
>+%%DATADIR%%/tools/bin/sstablesplit
> %%DATADIR%%/tools/bin/token-generator
>+%%DATADIR%%/tools/cqlstress-counter-example.yaml
>+%%DATADIR%%/tools/cqlstress-example.yaml
>+%%DATADIR%%/tools/cqlstress-insanity-example.yaml
>+%%DATADIR%%/tools/lib/cassandra-driver-core-2.0.5.jar
>+%%DATADIR%%/tools/lib/netty-3.9.0.Final.jar
> %%DATADIR%%/tools/lib/stress.jar
>+%%MX4J%%%%DATADIR%%/lib/mx4j-tools.jar
>+bin/cassandra
>+bin/cassandra-cli
>+bin/debug-cql
>+bin/nodetool
>+bin/sstablekeys
>+bin/sstableloader
>+bin/sstablescrub
>+bin/sstableupgrade
>+

Actions: View | Diff

Attachments on bug 194698: 148781 | 148986 | 149294