Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5e400df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5e400df Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5e400df Branch: refs/heads/trunk Commit: d5e400dfe39b91b839734cb38d6f7b9df1b2b1c3 Parents: e9ef792 ac6ca9c Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Apr 5 16:32:08 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Apr 5 16:32:08 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/config/DatabaseDescriptor.java | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5e400df/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d576b8e,4baaa30..5c6bdb5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,36 -1,5 +1,38 @@@ -3.0.6 +3.6 + * Add static column support to SASI index (CASSANDRA-11183) + * Support EQ/PREFIX queries in SASI CONTAINS mode without tokenization (CASSANDRA-11434) + * Support LIKE operator in prepared statements (CASSANDRA-11456) + * Add a command to see if a Materialized View has finished building (CASSANDRA-9967) + * Log endpoint and port associated with streaming operation (CASSANDRA-8777) + * Print sensible units for all log messages (CASSANDRA-9692) + * Upgrade Netty to version 4.0.34 (CASSANDRA-11096) + * Break the CQL grammar into separate Parser and Lexer (CASSANDRA-11372) + * Compress only inter-dc traffic by default (CASSANDRA-8888) + * Add metrics to track write amplification (CASSANDRA-11420) + * cassandra-stress: cannot handle "value-less" tables (CASSANDRA-7739) + * Add/drop multiple columns in one ALTER TABLE statement (CASSANDRA-10411) + * Add require_endpoint_verification opt for internode encryption (CASSANDRA-9220) + * Add auto import java.util for UDF code block (CASSANDRA-11392) + * Add --hex-format option to nodetool getsstables (CASSANDRA-11337) + * sstablemetadata should print sstable min/max token (CASSANDRA-7159) + * Do not wrap CassandraException in TriggerExecutor (CASSANDRA-9421) + * COPY TO should have higher double precision (CASSANDRA-11255) + * Stress should exit with non-zero status after failure (CASSANDRA-10340) + * Add client to cqlsh SHOW_SESSION (CASSANDRA-8958) + * Fix nodetool tablestats keyspace level metrics (CASSANDRA-11226) + * Store repair options in parent_repair_history (CASSANDRA-11244) + * Print current leveling in sstableofflinerelevel (CASSANDRA-9588) + * Change repair message for keyspaces with RF 1 (CASSANDRA-11203) + * Remove hard-coded SSL cipher suites and protocols (CASSANDRA-10508) + * Improve concurrency in CompactionStrategyManager (CASSANDRA-10099) + * (cqlsh) interpret CQL type for formatting blobs (CASSANDRA-11274) + * Refuse to start and print txn log information in case of disk + corruption (CASSANDRA-10112) + * Resolve some eclipse-warnings (CASSANDRA-11086) + * (cqlsh) Show static columns in a different color (CASSANDRA-11059) + * Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207) ++Merged from 3.0: + * Validate that num_tokens and initial_token are consistent with one another (CASSANDRA-10120) Merged from 2.2: * IncomingStreamingConnection version check message wrong (CASSANDRA-11462) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5e400df/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------