Merge branch 'cassandra-2.2' into cassandra-3.0 is merge is necessary,
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/64a3bfd2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64a3bfd2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64a3bfd2 Branch: refs/heads/cassandra-3.1 Commit: 64a3bfd29290f53db1e730e955bd401bc68310e3 Parents: 2cbd776 8bfdd65 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Nov 26 10:42:22 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Nov 26 10:42:22 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/64a3bfd2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bd7006e,237c251..04cda25 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -14,9 -4,19 +14,10 @@@ Merged from 2.2 * Fix SimpleDateType type compatibility (CASSANDRA-10027) * (Hadoop) fix splits calculation (CASSANDRA-10640) * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) - * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) - * Use most up-to-date version of schema for system tables (CASSANDRA-10652) - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) - * Expose phi values from failure detector via JMX and tweak debug - and trace logging (CASSANDRA-9526) - * Fix RangeNamesQueryPager (CASSANDRA-10509) - * Deprecate Pig support (CASSANDRA-10542) - * Reduce contention getting instances of CompositeType (CASSANDRA-10433) Merged from 2.1: + * Properly reject counters as map keys (CASSANDRA-10760) * Fix the sstable-needs-cleanup check (CASSANDRA-10740) * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) - * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) * Try next replica if not possible to connect to primary replica on http://git-wip-us.apache.org/repos/asf/cassandra/blob/64a3bfd2/src/java/org/apache/cassandra/cql3/CQL3Type.java ----------------------------------------------------------------------
