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/842e7c3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/842e7c3f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/842e7c3f Branch: refs/heads/trunk Commit: 842e7c3fbf93c7a0191c7314f00d84057634bf92 Parents: db10cb2 c74df40 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Mar 22 15:50:21 2016 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Mar 22 15:50:21 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/copyutil.py | 43 +++++++++++++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/842e7c3f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a077551,e4db50e..21eb3e5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ -2.2.6 +3.0.5 + * Support streaming pre-3.0 sstables (CASSANDRA-10990) + * Add backpressure to compressed commit log (CASSANDRA-10971) + * SSTableExport supports secondary index tables (CASSANDRA-11330) + * Fix sstabledump to include missing info in debug output (CASSANDRA-11321) + * Establish and implement canonical bulk reading workload(s) (CASSANDRA-10331) + * Fix paging for IN queries on tables without clustering columns (CASSANDRA-11208) + * Remove recursive call from CompositesSearcher (CASSANDRA-11304) + * Fix filtering on non-primary key columns for queries without index (CASSANDRA-6377) + * Fix sstableloader fail when using materialized view (CASSANDRA-11275) +Merged from 2.2: + * cqlsh: COPY FROM should check that explicit column names are valid (CASSANDRA-11333) * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809) * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748) * Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900) http://git-wip-us.apache.org/repos/asf/cassandra/blob/842e7c3f/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------