Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b3e6a433 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3e6a433 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3e6a433 Branch: refs/heads/cassandra-3.1 Commit: b3e6a433eaf8486c8bd5306c48ffa3cb826234bb Parents: db97083 4ecbbc0 Author: Robert Stupp <sn...@snazy.de> Authored: Fri Nov 27 10:44:14 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Nov 27 10:44:14 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cql3/statements/DropTypeStatement.java | 10 ++++-- .../cql3/validation/entities/TypeTest.java | 10 ++++++ .../cql3/validation/entities/UFTest.java | 14 ++++++++ .../validation/operations/AggregationTest.java | 14 ++++++++ .../cql3/validation/operations/DropTest.java | 37 ++++++++++++++++++++ 6 files changed, 84 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3e6a433/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8779275,4adcf4f..c2940cc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,5 +1,20 @@@ -2.1.12 +2.2.4 + * 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) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Some DROP ... IF EXISTS incorrectly result in exceptions on non-existing KS (CASSANDRA-10658) * DeletionTime.compareTo wrong in rare cases (CASSANDRA-10749) * Force encoding when computing statement ids (CASSANDRA-10755) * Properly reject counters as map keys (CASSANDRA-10760) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3e6a433/src/java/org/apache/cassandra/cql3/statements/DropTypeStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3e6a433/test/unit/org/apache/cassandra/cql3/validation/entities/TypeTest.java ----------------------------------------------------------------------