natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.2' into trunk 

Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
This commit is contained in:
T Jake Luciani 2015-07-17 13:11:23 -04:00
parent 107f141e09 b10a51a423
commit 13f2c1339c
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/cassandra.install vendored
View File

@ -14,6 +14,7 @@ bin/nodetool usr/bin
bin/sstablekeys usr/bin bin/sstablekeys usr/bin
bin/sstableloader usr/bin bin/sstableloader usr/bin
bin/cqlsh usr/bin bin/cqlsh usr/bin
bin/cqlsh.py usr/bin
bin/sstablescrub usr/bin bin/sstablescrub usr/bin
bin/sstableupgrade usr/bin bin/sstableupgrade usr/bin
tools/bin/cassandra-stress usr/bin tools/bin/cassandra-stress usr/bin