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/04b2528b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04b2528b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04b2528b Branch: refs/heads/trunk Commit: 04b2528bf1e889e81c9d7009d0415c90276f9ea1 Parents: c0f2dc5 c10ae57 Author: Sam Tunnicliffe <[email protected]> Authored: Tue Oct 27 12:49:21 2015 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Tue Oct 27 12:49:21 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/schema/KeyspaceMetadata.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04b2528b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c28d3bd,286e490..c83a79c --- 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 + * Ensure compaction options are validated when updating KeyspaceMetadata (CASSANDRA-10569) * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975) * Remove token generator (CASSANDRA-5261) * RolesCache should not be created for any authenticator that does not requireAuthentication (CASSANDRA-10562)
