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.1' into trunk
Date Tue, 10 Nov 2015 14:43:16 GMT
Merge branch 'cassandra-3.1' into trunk


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

Branch: refs/heads/trunk
Commit: 3ea35bda6e64b373734363a47ff62cce4fe3102c
Parents: 41c69ac 84fe374
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Nov 10 14:43:04 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Nov 10 14:43:04 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 .../cassandra/hadoop/cql3/CqlRecordWriter.java  | 94 ++++++++++----------
 .../io/sstable/CQLSSTableWriterTest.java        |  2 +-
 3 files changed, 51 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ea35bda/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index dc912f1,03b8544..8c41f50
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,6 +1,12 @@@
 +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.1
+ Merged from 2.2:
+  * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
  Merged from 2.1:
   * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258)
   * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)


Mime
View raw message