cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [6/8] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 10 Feb 2016 23:39:57 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/d7195060
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7195060
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7195060

Branch: refs/heads/cassandra-2.2
Commit: d7195060cd9b75c6cddf6d95071b6fb28f955961
Parents: c08aaf6 6c6b7e4
Author: Yuki Morishita <yukim@apache.org>
Authored: Wed Feb 10 17:37:40 2016 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Wed Feb 10 17:37:40 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/service/StorageService.java       | 32 +++++++++++---------
 2 files changed, 19 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7195060/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index fdd1122,3bbef11..318672f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,8 +1,11 @@@
 -2.1.14
 +2.2.6
 + * (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:
+  * Improve nodetool status performance for large cluster (CASSANDRA-7238)
 - * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
   * Gossiper#isEnabled is not thread safe (CASSANDRA-11116)
   * Avoid major compaction mixing repaired and unrepaired sstables in DTCS (CASSANDRA-11113)
 + * Make it clear what DTCS timestamp_resolution is used for (CASSANDRA-11041)
   * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7195060/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message