cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Mon, 09 Nov 2015 15:42:12 GMT
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/b0def95b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0def95b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0def95b

Branch: refs/heads/cassandra-3.0
Commit: b0def95b596448564890ab8f88ef8da9739f823c
Parents: b5b1252 852a8ba
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Mon Nov 9 15:40:42 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Mon Nov 9 15:40:42 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                             | 1 +
 src/java/org/apache/cassandra/net/MessagingService.java | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0def95b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 814a924,123c1f3..fa868fe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 -2.1.12
 +2.2.4
 + * (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:
+  * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)
   * Improve json2sstable error reporting on nonexistent columns (CASSANDRA-10401)
   * (cqlsh) fix COPY using wrong variable name for time_format (CASSANDRA-10633)
   * Do not run SizeEstimatesRecorder if a node is not a member of the ring (CASSANDRA-9912)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b0def95b/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------


Mime
View raw message