cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 02 Oct 2015 15:10:57 GMT
Merge branch 'cassandra-3.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/368c141b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/368c141b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/368c141b

Branch: refs/heads/trunk
Commit: 368c141b0fa7360f6adacb47e1aa11b425844b2a
Parents: 2d991a7 62ffa35
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Oct 2 17:10:49 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Oct 2 17:10:49 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 src/java/org/apache/cassandra/db/Keyspace.java  | 27 +++++++---
 src/java/org/apache/cassandra/db/Mutation.java  |  6 ++-
 src/java/org/apache/cassandra/db/view/View.java |  3 ++
 .../apache/cassandra/db/view/ViewBuilder.java   |  4 +-
 .../apache/cassandra/db/view/ViewManager.java   | 19 ++-----
 .../cassandra/metrics/KeyspaceMetrics.java      |  8 ++-
 .../apache/cassandra/metrics/TableMetrics.java  | 57 ++++++++++++++++++--
 .../cassandra/metrics/ViewWriteMetrics.java     | 18 ++++++-
 .../apache/cassandra/service/StorageProxy.java  | 22 +++++---
 10 files changed, 128 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/368c141b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index efb1efe,5bf70ca..95a940b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Provide additional metrics for materialized views (CASSANDRA-10323)
   * Flush system schema tables after local schema changes (CASSANDRA-10429)
  Merged from 2.2:
   * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)


Mime
View raw message