Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
        build.xml
        debian/changelog


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b84d06f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b84d06f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b84d06f4

Branch: refs/heads/cassandra-2.1
Commit: b84d06f4c77032855e5b9e57c6132a5d2600a933
Parents: 8fca88e 3c8a2a7
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Fri Oct 17 13:45:47 2014 +0200
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Fri Oct 17 13:45:47 2014 +0200

----------------------------------------------------------------------
 NEWS.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b84d06f4/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index ecdb47e,6f6b795..d3d7b76
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,89 -13,14 +13,95 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +2.1.1
 +=====
 +
 +Upgrading
 +---------
 +    - Nothing specific to this release, but please see 2.1 if you are 
upgrading
 +      from a previous version.
 +
 +New features
 +------------
 +   - Netty support for epoll on linux is now enabled.  If for some
 +     reason you want to disable it pass, the following system property
 +     -Dcassandra.native.epoll.enabled=false
 +
 +2.1
 +===
 +
 +New features
 +------------
 +   - Default data and log locations have changed.  If not set in
 +     cassandra.yaml, the data file directory, commitlog directory,
 +     and saved caches directory will default to $CASSANDRA_HOME/data/data,
 +     $CASSANDRA_HOME/data/commitlog, and $CASSANDRA_HOME/data/saved_caches,
 +     respectively.  The log directory now defaults to $CASSANDRA_HOME/logs.
 +     If not set, $CASSANDRA_HOME, defaults to the top-level directory of
 +     the installation.
 +     Note that this should only affect source checkouts and tarballs.
 +     Deb and RPM packages will continue to use /var/lib/cassandra and
 +     /var/log/cassandra in cassandra.yaml.
 +   - SSTable data directory name is slightly changed. Each directory will
 +     have hex string appended after CF name, e.g.
 +         ks/cf-5be396077b811e3a3ab9dc4b9ac088d/
 +     This hex string part represents unique ColumnFamily ID.
 +     Note that existing directories are used as is, so only newly created
 +     directories after upgrade have new directory name format.
 +   - Saved key cache files also have ColumnFamily ID in their file name.
 +   - It is now possible to do incremental repairs, sstables that have been
 +     repaired are marked with a timestamp and not included in the next
 +     repair session. Use nodetool repair -par -inc to use this feature.
 +     A tool to manually mark/unmark sstables as repaired is available in
 +     tools/bin/sstablerepairedset. This is particularly important when
 +     using LCS, or any data not repaired in your first incremental repair
 +     will be put back in L0.
 +   - Bootstrapping now ensures that range movements are consistent,
 +     meaning the data for the new node is taken from the node that is no 
 +     longer a responsible for that range of keys.
 +     If you want the old behavior (due to a lost node perhaps)
 +     you can set the following property 
(-Dcassandra.consistent.rangemovement=false)
 +   - It is now possible to use quoted identifiers in triggers' names. 
 +     WARNING: if you previously used triggers with capital letters in their 
 +     names, then you must quote them from now on.
 +   - Improved stress tool (http://goo.gl/OTNqiQ)
 +   - New incremental repair option (http://goo.gl/MjohJp, 
http://goo.gl/f8jSme)
 +   - Incremental replacement of compacted SSTables (http://goo.gl/JfDBGW)
 +   - The row cache can now cache only the head of partitions 
(http://goo.gl/6TJPH6)
 +   - Off-heap memtables (http://goo.gl/YT7znJ)
 +   - CQL improvements and additions: User-defined types, tuple types, 2ndary
 +     indexing of collections, ... (http://goo.gl/kQl7GW)
 +
 +Upgrading
 +---------
 +   - Rolling upgrades from anything pre-2.0.7 is not supported. Furthermore
 +     pre-2.0 sstables are not supported. This means that before upgrading
 +     a node on 2.1, this node must be started on 2.0 and
 +     'nodetool upgdradesstables' must be run (and this even in the case
 +     of not-rolling upgrades).
 +   - For size-tiered compaction users, Cassandra now defaults to ignoring
 +     the coldest 5% of sstables.  This can be customized with the
 +     cold_reads_to_omit compaction option; 0.0 omits nothing (the old
 +     behavior) and 1.0 omits everything.
 +   - Multithreaded compaction has been removed.
 +   - Counters implementation has been changed, replaced by a safer one with
 +     less caveats, but different performance characteristics. You might have
 +     to change your data model to accomodate the new implementation.
 +     (See https://issues.apache.org/jira/browse/CASSANDRA-6504 and the
 +     blog post at http://goo.gl/qj8iQl for details).
 +   - (per-table) index_interval parameter has been replaced with
 +     min_index_interval and max_index_interval paratemeters. index_interval
 +     has been deprecated.
 +   - support for supercolumns has been removed from json2sstable
 +
  2.0.11
  ======
+ 
+ Upgrading
+ ---------
+     - Nothing specific to this release, but refer to previous entries if you
+       are upgrading from a previous version.
+ 
  New features
  ------------
      - DateTieredCompactionStrategy added, optimized for time series data and 
groups

Reply via email to