Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9a84831 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9a84831 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9a84831 Branch: refs/heads/cassandra-2.2 Commit: a9a848318d6ce5b024eaf7d3e821c79d40935f59 Parents: afc5093 39c082f Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Fri Jun 26 12:59:07 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Fri Jun 26 12:59:07 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cql3/statements/CreateIndexStatement.java | 5 ++- .../cql3/validation/operations/CreateTest.java | 32 ++++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9a84831/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a4e348e,498218e..8469232 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,20 +1,33 @@@ -2.1.8 +2.2 + * Allow JMX over SSL directly from nodetool (CASSANDRA-9090) + * Update cqlsh for UDFs (CASSANDRA-7556) + * Change Windows kernel default timer resolution (CASSANDRA-9634) + * Deprected sstable2json and json2sstable (CASSANDRA-9618) + * Allow native functions in user-defined aggregates (CASSANDRA-9542) + * Don't repair system_distributed by default (CASSANDRA-9621) + * Fix mixing min, max, and count aggregates for blob type (CASSANRA-9622) + * Rename class for DATE type in Java driver (CASSANDRA-9563) + * Duplicate compilation of UDFs on coordinator (CASSANDRA-9475) + * Fix connection leak in CqlRecordWriter (CASSANDRA-9576) + * Mlockall before opening system sstables & remove boot_without_jna option (CASSANDRA-9573) + * Add functions to convert timeuuid to date or time, deprecate dateOf and unixTimestampOf (CASSANDRA-9229) + * Make sure we cancel non-compacting sstables from LifecycleTransaction (CASSANDRA-9566) + * Fix deprecated repair JMX API (CASSANDRA-9570) + * Add logback metrics (CASSANDRA-9378) + * Update and refactor ant test/test-compression to run the tests in parallel (CASSANDRA-9583) +Merged from 2.1: * Fix IndexOutOfBoundsException when inserting tuple with too many elements using the string literal notation (CASSANDRA-9559) - * Allow JMX over SSL directly from nodetool (CASSANDRA-9090) - * Fix incorrect result for IN queries where column not found (CASSANDRA-9540) * Enable describe on indices (CASSANDRA-7814) + * Fix incorrect result for IN queries where column not found (CASSANDRA-9540) * ColumnFamilyStore.selectAndReference may block during compaction (CASSANDRA-9637) -Merged from 2.0 - * Fix error message when attempting to create an index on a column - in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527) - * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565) - - -2.1.7 * Fix bug in cardinality check when compacting (CASSANDRA-9580) * Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour (CASSANDRA-9549) + * Make rebuild only run one at a time (CASSANDRA-9119) Merged from 2.0 ++ * Fix error message when attempting to create an index on a column ++ in a COMPACT STORAGE table with clustering columns (CASSANDRA-9527) + * 'WITH WITH' in alter keyspace statements causes NPE (CASSANDRA-9565) * Expose some internals of SelectStatement for inspection (CASSANDRA-9532) * ArrivalWindow should use primitives (CASSANDRA-9496) * Periodically submit background compaction tasks (CASSANDRA-9592) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9a84831/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9a84831/test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java ----------------------------------------------------------------------