Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d37fc4c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d37fc4c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d37fc4c Branch: refs/heads/trunk Commit: 5d37fc4c4eb5e82f11194b1b5ce3b1a9f463e607 Parents: d87921c cfc398e Author: T Jake Luciani <[email protected]> Authored: Tue Apr 26 13:13:16 2016 -0400 Committer: T Jake Luciani <[email protected]> Committed: Tue Apr 26 13:13:42 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ debian/cassandra-tools.install | 1 + debian/cassandra.install | 1 + 3 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d37fc4c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 11bbbed,d73ed01..277eac4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,19 @@@ -2.2.7 +3.0.6 + * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654) + * Ignore all LocalStrategy keyspaces for streaming and other related + operations (CASSANDRA-11627) + * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523) + * Only open one sstable scanner per sstable (CASSANDRA-11412) + * Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410) + * ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485) + * LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470) + * Notify indexers of expired rows during compaction (CASSANDRA-11329) + * Properly respond with ProtocolError when a v1/v2 native protocol + 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d37fc4c/debian/cassandra-tools.install ---------------------------------------------------------------------- diff --cc debian/cassandra-tools.install index 957f2c0,6df21f3..8806344 --- a/debian/cassandra-tools.install +++ b/debian/cassandra-tools.install @@@ -1,6 -1,7 +1,7 @@@ -tools/bin/json2sstable usr/bin -tools/bin/sstable2json usr/bin +tools/bin/sstableexpiredblockers usr/bin tools/bin/sstablelevelreset usr/bin tools/bin/sstablemetadata usr/bin +tools/bin/sstableofflinerelevel usr/bin tools/bin/sstablerepairedset usr/bin tools/bin/sstablesplit usr/bin -tools/bin/token-generator usr/bin ++tools/bin/sstabledump usr/bin http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d37fc4c/debian/cassandra.install ----------------------------------------------------------------------
