cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Mon, 24 Aug 2015 17:50:36 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/5b439369
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b439369
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b439369

Branch: refs/heads/trunk
Commit: 5b4393694760d530648a818b2b1d10429b95a0e4
Parents: d200822 e769324
Author: T Jake Luciani <jake@apache.org>
Authored: Mon Aug 24 13:50:20 2015 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Mon Aug 24 13:50:20 2015 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |  3 +-
 src/java/org/apache/cassandra/db/Keyspace.java  |  2 +-
 .../cassandra/db/view/MaterializedView.java     | 86 ++++++++++++++------
 .../db/view/MaterializedViewBuilder.java        |  5 +-
 .../db/view/MaterializedViewManager.java        | 10 ++-
 .../apache/cassandra/db/view/TemporalRow.java   | 58 ++++++++++++-
 .../apache/cassandra/service/StorageProxy.java  | 29 +++++--
 7 files changed, 154 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b439369/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a925784,2695233..60ab277
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,6 +1,10 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-beta2
+  * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061)
+  * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060)
   * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
   * Fix sstablerepairedset (CASSANDRA-10132)
  


Mime
View raw message