cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Date Fri, 06 Dec 2013 15:28:36 GMT
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: c00e05b65eda9d2e784663f13e83583bc4944d3b
Parents: e978034 f54f4e2
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Dec 6 18:28:22 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Dec 6 18:28:22 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                                     |  3 +-
 .../apache/cassandra/service/StorageProxy.java  | 39 +-------------------
 2 files changed, 3 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c00e05b6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f8a12c9,43d0e9d..4568186
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -23,9 -4,9 +23,10 @@@
   * Fix divide-by-zero in PCI (CASSANDRA-6403)
   * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
   * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395)
 + * Add snapshot space used to cfstats (CASSANDRA-6231)
   * Expose a total memtable size metric for a CF (CASSANDRA-6391)
-  * cqlsh: hanlde symlinks properly (CASSANDRA-6425)
+  * cqlsh: handle symlinks properly (CASSANDRA-6425)
+  * Don't resubmit counter mutation runnables internally (CASSANDRA-6427)
  Merged from 1.2:
   * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345)
   * cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)

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


Mime
View raw message