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/375465d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/375465d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/375465d1 Branch: refs/heads/trunk Commit: 375465d1c603258b97caee4ed4a9ecddf382c771 Parents: 6f5c7a4 959b96e Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Sep 18 19:16:38 2015 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Sep 18 19:16:38 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/hints/HintsCatalog.java | 8 +++ .../cassandra/hints/HintsDispatchExecutor.java | 64 +++++++++++++++++++- .../apache/cassandra/hints/HintsDispatcher.java | 4 +- .../apache/cassandra/hints/HintsService.java | 45 ++++++++++++-- .../cassandra/service/StorageService.java | 29 ++++----- 6 files changed, 124 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/375465d1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0ffd919,d95d833..e805446 --- 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-rc1 + * Transfer hints to a different node on decommission (CASSANDRA-10198) * Check partition keys for CAS operations during stmt validation (CASSANDRA-10338) * Add custom query expressions to SELECT (CASSANDRA-10217) * Fix minor bugs in MV handling (CASSANDRA-10362)
