cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Mon, 09 Nov 2015 15:45:14 GMT
Merge branch 'cassandra-3.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b39c9c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b39c9c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b39c9c9

Branch: refs/heads/trunk
Commit: 1b39c9c9cc8f0ce3fd56ec036ee2b91866f57751
Parents: 6ed32a3 b408f9e
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Mon Nov 9 15:45:01 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Mon Nov 9 15:45:01 2015 +0000

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b39c9c9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 88d3fd2,a1f66fa..ed825ac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,8 +1,14 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
+ 3.0.1
+ Merged from 2.1:
+  * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)
+ 
+ 
  3.0
   * Fix AssertionError while flushing memtable due to materialized views
     incorrectly inserting empty rows (CASSANDRA-10614)

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


Mime
View raw message