cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Date Tue, 10 Nov 2015 13:47:20 GMT
Merge branch 'cassandra-3.0' into cassandra-3.1


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

Branch: refs/heads/cassandra-3.1
Commit: e8ee9ed4b965a9bf9addc5f0e1c476d56c19704d
Parents: fa741a5 1e64a9d
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Nov 10 13:46:47 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Nov 10 13:46:47 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +-
 .../cassandra/io/sstable/CQLSSTableWriter.java  |  2 ++
 .../io/sstable/CQLSSTableWriterTest.java        | 22 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8ee9ed4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e045905,33adefb..268ad08
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,6 +1,6 @@@
 -3.0.1
 +3.1
  Merged from 2.1:
+  * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258)
   * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)
  
  


Mime
View raw message