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/2bb1bfcb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2bb1bfcb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2bb1bfcb

Branch: refs/heads/trunk
Commit: 2bb1bfcb9525b2f43a9f1297861662e528b3e96f
Parents: 4254de1 3fc1067
Author: Stefania Alborghetti <stefania.alborghe...@datastax.com>
Authored: Thu Apr 28 09:15:26 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com>
Committed: Thu Apr 28 09:16:51 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 NEWS.txt    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bb1bfcb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6466310,46206b1..f78ea90
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,64 -1,4 +1,63 @@@
 -3.0.6
 +3.6
 + * Always perform collision check before joining ring (CASSANDRA-10134)
 + * SSTableWriter output discrepancy (CASSANDRA-11646)
 + * Fix potential timeout in NativeTransportService.testConcurrentDestroys 
(CASSANDRA-10756)
 + * Support large partitions on the 3.0 sstable format (CASSANDRA-11206)
-  * JSON datetime formatting needs timezone (CASSANDRA-11137)
 + * Add support to rebuild from specific range (CASSANDRA-10406)
 + * Optimize the overlapping lookup by calculating all the
 +   bounds in advance (CASSANDRA-11571)
 + * Support json/yaml output in noetool tablestats (CASSANDRA-5977)
 + * (stress) Add datacenter option to -node options (CASSANDRA-11591)
 + * Fix handling of empty slices (CASSANDRA-11513)
 + * Make number of cores used by cqlsh COPY visible to testing code 
(CASSANDRA-11437)
 + * Allow filtering on clustering columns for queries without secondary 
indexes (CASSANDRA-11310)
 + * Refactor Restriction hierarchy (CASSANDRA-11354)
 + * Eliminate allocations in R/W path (CASSANDRA-11421)
 + * Update Netty to 4.0.36 (CASSANDRA-11567)
 + * Fix PER PARTITION LIMIT for queries requiring post-query ordering 
(CASSANDRA-11556)
 + * Allow instantiation of UDTs and tuples in UDFs (CASSANDRA-10818)
 + * Support UDT in CQLSSTableWriter (CASSANDRA-10624)
 + * Support for non-frozen user-defined types, updating
 +   individual fields of user-defined types (CASSANDRA-7423)
 + * Make LZ4 compression level configurable (CASSANDRA-11051)
 + * Allow per-partition LIMIT clause in CQL (CASSANDRA-7017)
 + * Make custom filtering more extensible with UserExpression (CASSANDRA-11295)
 + * Improve field-checking and error reporting in cassandra.yaml 
(CASSANDRA-10649)
 + * Print CAS stats in nodetool proxyhistograms (CASSANDRA-11507)
 + * More user friendly error when providing an invalid token to nodetool 
(CASSANDRA-9348)
 + * 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:
   * Don't require HEAP_NEW_SIZE to be set when using G1 (CASSANDRA-11600)
   * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
   * Ignore all LocalStrategy keyspaces for streaming and other related

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2bb1bfcb/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 7f24d2c,3dcb387..77d3dfd
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -18,22 -18,18 +18,24 @@@ using the provided 'sstableupgrade' too
  
  New features
  ------------
 -    - JSON timestamps are now in UTC and contain the timezone information, see
 -      CASSANDRA-11137 for more details.
 -
 -3.0.5
 -=====
 -
 -Upgrading
 ----------
 -   - Nothing specific to this release, but please see previous versions 
upgrading section,
 -     especially if you are upgrading from 2.2.
 -
 -3.0.4
++   - JSON timestamps are now in UTC and contain the timezone information, see
++     CASSANDRA-11137 for more details.
 +   - Collision checks are performed when joining the token ring, regardless 
of whether
 +     the node should bootstrap. Additionally, replace_address can 
legitimately be used
 +     without bootstrapping to help with recovery of nodes with partially 
failed disks.
 +     See CASSANDRA-10134 for more details.
 +   - Key cache will only hold indexed entries up to the size configured by
 +     column_index_cache_size_in_kb in cassandra.yaml in memory. Larger 
indexed entries
 +     will never go into memory. See CASSANDRA-11206 for more details.
 +   - For tables having a default_time_to_live specifying a TTL of 0 will 
remove the TTL
 +     from the inserted or updated values.
 +   - Startup is now aborted if corrupted transaction log files are found. The 
details
 +     of the affected log files are now logged, allowing the operator to 
decide how
 +     to resolve the situation.
 +   - Filtering expressions are made more pluggable and can be added 
programatically via
 +     a QueryHandler implementation. See CASSANDRA-11295 for more details.
 +
 +3.4
  =====
  
  New features

Reply via email to