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/6f848db4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f848db4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f848db4 Branch: refs/heads/trunk Commit: 6f848db4c071d89b6ee8ba54beded4274fe5347b Parents: f91aad4 db7feb4 Author: Robert Stupp <[email protected]> Authored: Mon Oct 26 13:39:38 2015 +0100 Committer: Robert Stupp <[email protected]> Committed: Mon Oct 26 13:39:38 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 1 + tools/bin/token-generator | 356 ------------------------------------- tools/bin/token-generator.bat | 34 ---- 4 files changed, 2 insertions(+), 390 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f848db4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2c4a145,0457917..02f6584 --- 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 + * Remove token generator (CASSANDRA-5261) * RolesCache should not be created for any authenticator that does not requireAuthentication (CASSANDRA-10562) * Fix LogTransaction checking only a single directory for files (CASSANDRA-10421) * Support encrypted and plain traffic on the same port (CASSANDRA-10559)
