cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [07/10] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 17 Feb 2016 15:53:59 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 78f46ded7fdac473c4cbb0391a13090e8eb51324
Parents: 97f3aa6 434dfc9
Author: Yuki Morishita <yukim@apache.org>
Authored: Wed Feb 17 09:53:12 2016 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Wed Feb 17 09:53:12 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt                                         | 1 +
 src/java/org/apache/cassandra/tools/BulkLoader.java | 3 +++
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/78f46ded/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 288f204,55f806c..2a3854b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 -2.1.14
 +2.2.6
 + * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
 + * Use cloned TokenMetadata in size estimates to avoid race against membership check
 +   (CASSANDRA-10736)
 + * Always persist upsampled index summaries (CASSANDRA-10512)
 + * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
 + * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
 + * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
 + * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
 + * Fix paging on DISTINCT queries repeats result when first row in partition changes
 +   (CASSANDRA-10010)
 +Merged from 2.1:
+  * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)
   * Fix incorrect warning in 'nodetool status' (CASSANDRA-10176)
   * Properly release sstable ref when doing offline scrub (CASSANDRA-10697)
   * Improve nodetool status performance for large cluster (CASSANDRA-7238)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/78f46ded/src/java/org/apache/cassandra/tools/BulkLoader.java
----------------------------------------------------------------------


Mime
View raw message