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/587fe51b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/587fe51b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/587fe51b Branch: refs/heads/trunk Commit: 587fe51b1abb73ce0847d75dedd465a1214492a2 Parents: 557bbbc 15334f4 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Oct 7 10:43:38 2015 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Oct 7 10:43:38 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/587fe51b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 725da54,ba0012e..518d722 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,5 +1,10 @@@ +3.2 + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0 + * Re-populate token metadata after commit log recovery (CASSANDRA-10293) * Provide additional metrics for materialized views (CASSANDRA-10323) * Flush system schema tables after local schema changes (CASSANDRA-10429) Merged from 2.2: http://git-wip-us.apache.org/repos/asf/cassandra/blob/587fe51b/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
