Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d689da36 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d689da36 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d689da36 Branch: refs/heads/cassandra-3.0 Commit: d689da3677f20160c077e96028b83e69fe0206f9 Parents: 5980b33 5de9de1 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Thu May 5 11:34:56 2016 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Thu May 5 11:34:56 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 20 ++++++++++++++------ pylib/cqlshlib/copyutil.py | 16 ++++++++++------ 3 files changed, 25 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d689da36/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 860a4c2,a46aa56..0679e11 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,8 +1,27 @@@ -2.2.7 +3.0.6 + * Disallow creating view with a static column (CASSANDRA-11602) + * Reduce the amount of object allocations caused by the getFunctions methods (CASSANDRA-11593) + * Potential error replaying commitlog with smallint/tinyint/date/time types (CASSANDRA-11618) + * Fix queries with filtering on counter columns (CASSANDRA-11629) + * Improve tombstone printing in sstabledump (CASSANDRA-11655) + * Fix paging for range queries where all clustering columns are specified (CASSANDRA-11669) + * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600) + * 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: + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) * Exit JVM if JMX server fails to startup (CASSANDRA-11540) * Produce a heap dump when exiting on OOM (CASSANDRA-9861) - * Avoid read repairing purgeable tombstones on range slices (CASSANDRA-11427) * Restore ability to filter on clustering columns when using a 2i (CASSANDRA-11510) * JSON datetime formatting needs timezone (CASSANDRA-11137) * Fix is_dense recalculation for Thrift-updated tables (CASSANDRA-11502) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d689da36/bin/cqlsh.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d689da36/pylib/cqlshlib/copyutil.py ----------------------------------------------------------------------