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/746e9e41 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/746e9e41 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/746e9e41 Branch: refs/heads/trunk Commit: 746e9e4196a87596d3a0a3e2775edf6cf45f0d8d Parents: d128103 02a53fa Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Nov 5 23:46:42 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Nov 5 23:46:42 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- src/java/org/apache/cassandra/service/StorageService.java | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/746e9e41/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d641314,6873edd..0dbc3a8 --- 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 bootstrapping with MVs (CASSANDRA-10621) * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584) * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634) * (Hadoop) fix CIF describeSplits() not handling 0 size estimates (CASSANDRA-10600) http://git-wip-us.apache.org/repos/asf/cassandra/blob/746e9e41/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
