Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bf3002d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bf3002d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bf3002d Branch: refs/heads/trunk Commit: 8bf3002dda0f239bbffdd09645eb42cbf5c1d89e Parents: 958aa7c 8feb66e Author: Aleksey Yeschenko <[email protected]> Authored: Tue Nov 24 23:24:58 2015 +0000 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Nov 24 23:24:58 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/MigrationManager.java | 24 ++++++++++++++++-- .../apache/cassandra/service/MigrationTask.java | 26 ++++++++++++++++++++ .../cassandra/service/StorageService.java | 9 +++---- 4 files changed, 53 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bf3002d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index dd17f11,75922bf..fa65735 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,6 +1,17 @@@ +3.2 + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * 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.1 Merged from 3.0: + * Wait for migration responses to complete before bootstrapping (CASSANDRA-10731) * Unable to create a function with argument of type Inet (CASSANDRA-10741) * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717) * Correctly preserve deletion info on updated rows when notifying indexers
