cassandra-commits mailing list archives

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

Branch: refs/heads/trunk
Commit: a20433245c42f089ad21caed85629434742407e9
Parents: f2af290 b0def95
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Mon Nov 9 15:42:00 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Mon Nov 9 15:42:00 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/a2043324/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3662e6e,fa868fe..0f59b5f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -39,7 -4,12 +39,8 @@@ Merged from 2.2
   * 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)
   * Improve handling of dead nodes in gossip (CASSANDRA-10298)

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


Mime
View raw message