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/489d6474 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/489d6474 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/489d6474 Branch: refs/heads/cassandra-3.1 Commit: 489d6474cc9bcdf412f6a23d707a81fd60a36e53 Parents: 7e6c1d5 53e777a Author: Robert Stupp <sn...@snazy.de> Authored: Fri Nov 27 09:21:25 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Nov 27 09:21:25 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + doc/cql3/CQL.textile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/489d6474/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e1a959a,361bbf6..729264c --- 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: + * CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC (CASSANDRA-10747) * Fix JSON update with prepared statements (CASSANDRA-10631) * Don't do anticompaction after subrange repair (CASSANDRA-10422) * Fix SimpleDateType type compatibility (CASSANDRA-10027) http://git-wip-us.apache.org/repos/asf/cassandra/blob/489d6474/doc/cql3/CQL.textile ----------------------------------------------------------------------
