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/40161607 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40161607 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40161607 Branch: refs/heads/trunk Commit: 401616076a422f6b9c8280fc6d245f72ce9ba5ac Parents: bc42f32 f3fcdd7 Author: Sylvain Lebresne <[email protected]> Authored: Fri Nov 20 15:21:30 2015 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Nov 20 15:21:30 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/hadoop/cql3/CqlConfigHelper.java | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40161607/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d9adfc2,6c879a4..8b50fc7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,6 +1,15 @@@ +3.2 + * 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: + * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717) * Correctly preserve deletion info on updated rows when notifying indexers of single-row deletions (CASSANDRA-10694) * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
