Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bfdd65c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bfdd65c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bfdd65c Branch: refs/heads/cassandra-2.2 Commit: 8bfdd65c0d0c3013b00902a64e591d4aaeaea4dd Parents: 31be903 cdf0485 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Nov 26 10:40:49 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Nov 26 10:40:49 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/8bfdd65c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7b32c2b,7978a56..237c251 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,8 +1,21 @@@ -2.1.12 +2.2.4 + * Fix JSON update with prepared statements (CASSANDRA-10631) + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * 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) - * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044) * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bfdd65c/src/java/org/apache/cassandra/cql3/CQL3Type.java ----------------------------------------------------------------------