You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2015/09/01 10:53:22 UTC
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
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/4e57b820
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e57b820
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e57b820
Branch: refs/heads/trunk
Commit: 4e57b8200e0dbcaa73ebd55ef413ab63b4612cc8
Parents: 8302ef7 782a1c3
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Sep 1 10:53:12 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Sep 1 10:53:12 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/cql3/UpdateParameters.java | 9 +-
.../org/apache/cassandra/db/DeletionTime.java | 4 +-
.../org/apache/cassandra/db/LegacyLayout.java | 72 +++++++-
.../cassandra/db/PartitionRangeReadCommand.java | 13 +-
.../org/apache/cassandra/db/ReadCommand.java | 76 ++++++--
.../org/apache/cassandra/db/ReadResponse.java | 28 +--
.../db/SinglePartitionNamesCommand.java | 9 +-
.../db/SinglePartitionReadCommand.java | 13 +-
.../db/SinglePartitionSliceCommand.java | 7 +-
.../UnfilteredPartitionIterators.java | 11 +-
.../apache/cassandra/db/rows/AbstractCell.java | 1 -
.../db/rows/UnfilteredRowIterators.java | 20 +-
.../org/apache/cassandra/repair/Validator.java | 2 +-
.../cassandra/service/AbstractReadExecutor.java | 9 +
.../cassandra/service/DigestResolver.java | 2 +-
.../cassandra/thrift/CassandraServer.java | 5 +-
.../cassandra/cache/CacheProviderTest.java | 5 +-
.../org/apache/cassandra/db/PartitionTest.java | 82 +++++----
.../rows/DigestBackwardCompatibilityTest.java | 182 +++++++++++++++++++
20 files changed, 452 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e57b820/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 08d6411,390255c..a55a5af
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
+3.2
+ * Add transparent data encryption core classes (CASSANDRA-9945)
+
+
3.0.0-beta2
+ * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554)
* Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156)
* Choose better poolingOptions for protocol v4 in cassandra-stress (CASSANDRA-10182)
* Fix LWW bug affecting Materialized Views (CASSANDRA-10197)