Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c35af2a7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c35af2a7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c35af2a7 Branch: refs/heads/cassandra-3.1 Commit: c35af2a7a16b4df2032c5134abc535d73e561d0b Parents: b166f5f e7116f2 Author: Benjamin Lerer <b.le...@gmail.com> Authored: Fri Nov 27 13:16:29 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Fri Nov 27 13:16:29 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/format/big/BigTableWriter.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c35af2a7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 472ed45,7281bd3..97c0eae --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -2.2.4 +3.0.1 + * Fix SELECT statement with IN restrictions on partition key, + ORDER BY and LIMIT (CASSANDRA-10729) + * Improve stress performance over 1k threads (CASSANDRA-7217) + * 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 + of single-row deletions (CASSANDRA-10694) + * Notify indexers of partition delete during cleanup (CASSANDRA-10685) + * Keep the file open in trySkipCache (CASSANDRA-10669) + * Updated trigger example (CASSANDRA-10257) +Merged from 2.2: + * Serialize on disk the proper SSTable compression ratio (CASSANDRA-10775) * Reject index queries while the index is building (CASSANDRA-8505) * CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC (CASSANDRA-10747) * Fix JSON update with prepared statements (CASSANDRA-10631) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c35af2a7/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java ----------------------------------------------------------------------
