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 cassandra-3.0

This commit is contained in:
T Jake Luciani 2016-04-26 13:13:16 -04:00
parent d87921c56d cfc398e818
commit 5d37fc4c4e
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -12,6 +12,8 @@
header is received (CASSANDRA-11464)
* Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120)
Merged from 2.2:
* Add missing files to debian packages (CASSANDRA-11642)
* Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621)
* cqlsh: COPY FROM should use regular inserts for single statement batches and
report errors correctly if workers processes crash on initialization (CASSANDRA-11474)
* Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553)

1
debian/cassandra-tools.install vendored
View File

@ -4,3 +4,4 @@ tools/bin/sstablemetadata usr/bin
tools/bin/sstableofflinerelevel usr/bin
tools/bin/sstablerepairedset usr/bin
tools/bin/sstablesplit usr/bin
tools/bin/sstabledump usr/bin

1
debian/cassandra.install vendored
View File

@ -18,6 +18,7 @@ bin/cqlsh usr/bin
bin/cqlsh.py usr/bin
bin/sstablescrub usr/bin
bin/sstableupgrade usr/bin
bin/sstableverify usr/bin
tools/bin/cassandra-stress usr/bin
lib/*.jar usr/share/cassandra/lib
lib/*.zip usr/share/cassandra/lib