cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 30 May 2014 20:52:39 GMT
Merge branch 'cassandra-2.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/d579be52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d579be52
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d579be52

Branch: refs/heads/trunk
Commit: d579be520331e5e0cd1fe9488721edd8ce526ca4
Parents: 62e83d8 90477c3
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri May 30 23:52:14 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri May 30 23:52:14 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                                     | 2 ++
 src/java/org/apache/cassandra/streaming/StreamTransferTask.java | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d579be52/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 178c0ea,a849897..be9c2ee
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,16 @@@
 +3.0
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7208)
 + * Make incremental repair default (CASSANDRA-7250)
 +
 +
  2.1.0
+ Merged from 2.0:
+  * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
  Merged from 1.2:
  * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
  


Mime
View raw message