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/f4dab0f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4dab0f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4dab0f9 Branch: refs/heads/cassandra-3.1 Commit: f4dab0f9b3a037c952aaa71219987eb4f44535e5 Parents: 64a3bfd e4f3dba Author: Sylvain Lebresne <[email protected]> Authored: Thu Nov 26 15:44:18 2015 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Nov 26 15:44:18 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/utils/MD5Digest.java | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4dab0f9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 04cda25,d31645a..eab04fb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -14,7 -4,16 +14,8 @@@ 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: + * Force encoding when computing statement ids (CASSANDRA-10755) * 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)
