cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [4/4] cassandra git commit: Merge branch cassandra-3.9 into trunk
Date Fri, 12 Aug 2016 13:47:18 GMT
Merge branch cassandra-3.9 into trunk


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

Branch: refs/heads/trunk
Commit: 69eca54eb8e6d86714e5ef28ba125433d3b041d5
Parents: fa4255f 0c771a2
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Fri Aug 12 15:45:29 2016 +0200
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Fri Aug 12 15:45:29 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/service/StorageProxy.java  | 49 +++++++++++++-------
 2 files changed, 34 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/69eca54e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e215ad9,b1b2050..c501084
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -122,6 -82,8 +122,7 @@@ Merged from 3.0
   * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
   * Fix EOF exception when altering column type (CASSANDRA-11820)
  Merged from 2.2:
+  * Update StorageProxy range metrics for timeouts, failures and unavailables (CASSANDRA-9507)
 - * Add Sigar to classes included in clientutil.jar (CASSANDRA-11635)
   * Add decay to histograms and timers used for metrics (CASSANDRA-11752)
   * Fix hanging stream session (CASSANDRA-10992)
   * Fix INSERT JSON, fromJson() support of smallint, tinyint types (CASSANDRA-12371)

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


Mime
View raw message