cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/4] git commit: Update changes and news file for 2.0.5 re-roll
Date Wed, 05 Feb 2014 15:37:05 GMT
Update changes and news file for 2.0.5 re-roll


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

Branch: refs/heads/cassandra-2.0
Commit: 29670eb6692f239a3e9b0db05f2d5a1b5d4eb8b0
Parents: 41de0bd
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Feb 5 09:22:13 2014 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Feb 5 09:22:13 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt | 14 +++++---------
 NEWS.txt    | 13 +++----------
 2 files changed, 8 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/29670eb6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7e0a89e..9599e56 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,12 +1,3 @@
-2.0.6
- * Fix direct Memory on architectures that do not support unaligned long access
-   (CASSANDRA-6628)
- * Let scrub optionally skip broken counter partitions (CASSANDRA-5930)
-Merged from 1.2:
- * Move handling of migration event source to solve bootstrap race. (CASSANDRA-6648)
- * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647)
- 
-
 2.0.5
  * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609)
  * Add ks.cf names to tombstone logging (CASSANDRA-6597)
@@ -29,6 +20,9 @@ Merged from 1.2:
  * Switch stress to use ITransportFactory (CASSANDRA-6641)
  * Fix IllegalArgumentException during prepare (CASSANDRA-6592)
  * Fix possible loss of 2ndary index entries during compaction (CASSANDRA-6517)
+ * Fix direct Memory on architectures that do not support unaligned long access
+   (CASSANDRA-6628)
+ * Let scrub optionally skip broken counter partitions (CASSANDRA-5930)
 Merged from 1.2:
  * fsync compression metadata (CASSANDRA-6531)
  * Validate CF existence on execution for prepared statement (CASSANDRA-6535)
@@ -43,6 +37,8 @@ Merged from 1.2:
  * Fix preparing with batch and delete from collection (CASSANDRA-6607)
  * Fix ABSC reverse iterator's remove() method (CASSANDRA-6629)
  * Handle host ID conflicts properly (CASSANDRA-6615)
+ * Move handling of migration event source to solve bootstrap race. (CASSANDRA-6648)
+ * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647)
 
 
 2.0.4

http://git-wip-us.apache.org/repos/asf/cassandra/blob/29670eb6/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index b21fbaa..b18150f 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -14,16 +14,6 @@ restore snapshots created with the previous major version using the
 using the provided 'sstableupgrade' tool.
 
 
-2.0.6
-=====
-
-New features
-------------
-    - Scrub can now optionally skip corrupt counter partitions. Please note
-      that this will lead to the loss of all the counter updates in the skipped
-      partition. See the --skip-corrupted option.
-
-
 2.0.5
 =====
 
@@ -31,6 +21,9 @@ New features
 ------------
     - Batchlog replay can be, and is throttled by default now.
       See batchlog_replay_throttle_in_kb setting in cassandra.yaml.
+    - Scrub can now optionally skip corrupt counter partitions. Please note
+      that this will lead to the loss of all the counter updates in the skipped
+      partition. See the --skip-corrupted option.
 
 Upgrading
 ---------


Mime
View raw message