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/d3617a34 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3617a34 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3617a34 Branch: refs/heads/trunk Commit: d3617a347dfbdaef80ed6fad39d3034f10bcf397 Parents: 04b2528 f901a74 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Oct 27 13:55:21 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Oct 27 13:55:21 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/statements/BatchStatement.java | 35 ++++++++++++++++++-- .../cql3/statements/ModificationStatement.java | 2 +- .../cql3/statements/UpdatesCollector.java | 10 +++--- .../cql3/validation/operations/BatchTest.java | 25 ++++++++++++++ 5 files changed, 65 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3617a34/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c83a79c,f8dffb0..c781166 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.2 + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0 + * Fix batches on multiple tables (CASSANDRA-10554) * Ensure compaction options are validated when updating KeyspaceMetadata (CASSANDRA-10569) * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975) * Remove token generator (CASSANDRA-5261) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3617a34/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java ----------------------------------------------------------------------
