Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/trunk
Commit: 5310f26d442f20d52d6fcef47ebbecc502b703d6
Parents: 89bccb6 8f0952e
Author: Dave Brosius <dbros...@mebigfatguy.com>
Authored: Sat Mar 8 22:22:31 2014 -0500
Committer: Dave Brosius <dbros...@mebigfatguy.com>
Committed: Sat Mar 8 22:22:31 2014 -0500

----------------------------------------------------------------------
 NEWS.txt                                         | 19 +++++++++++++++++++
 debian/changelog                                 |  6 ++++++
 .../org/apache/cassandra/tools/NodeProbe.java    |  2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5310f26d/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 865830c,18f89bc..23f6522
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,46 -13,26 +13,65 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +2.1
 +===
 +
 +New features
 +------------
 +   - 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.
 +
 +Upgrading
 +---------
 +   - Rolling upgrades from anything pre-2.0.6 is not supported.
 +   - For leveled compaction users, 2.0 must be atleast started before
 +     upgrading to 2.1 due to the fact that the old JSON leveled
 +     manifest is migrated into the sstable metadata files on startup
 +     in 2.0 and this code is gone from 2.1.
 +   - 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 dev
 +     blog post at http://www.datastax.com/dev/blog/<PLACEHOLDER> for details).
 +    - (per-table) index_interval parameter has been replaced with
 +     min_index_interval and max_index_interval paratemeters. index_interval
 +     has been deprecated.
 +
  
+ 2.0.6
+ =====
+ 
+ New features
+ ------------
+     - CQL now support static columns, allows to batch multiple conditional 
updates
+       and has a new syntax for slicing over multiple clustering columns
+       (http://goo.gl/B6qz4j).
+     - Repair can be restricted to a set of nodes using the -hosts option in 
nodetool.
+     - A new 'nodetool taketoken' command relocate tokens with vnodes.
+     - Hinted handoff can be enabled only for some data-centers (see
+       hinted_handoff_enabled in cassandra.yaml)
+ 
+ Upgrading
+ ---------
+     - Nothing specific to this release, but please see 2.0.6 if you are 
upgrading
+       from a previous version.
+ 
+ 
  2.0.5
  =====
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5310f26d/debian/changelog
----------------------------------------------------------------------
diff --cc debian/changelog
index a13370f,6cc4391..11f25cb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,15 @@@
 +cassandra (2.1.0~beta1) unstable; urgency=low
 +
 +  * New beta release
 +
 + -- Sylvain Lebresne <slebre...@apache.org>  Mon, 17 Feb 2014 16:50:33 +0100
 +
+ cassandra (2.0.6) unstable; urgency=low
+ 
+   * New release
+ 
+  -- Sylvain Lebresne <slebre...@apache.org>  Fri, 07 Mar 2014 13:18:42 +0100
+ 
  cassandra (2.0.5) unstable; urgency=low
  
    * New release

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5310f26d/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------

Reply via email to