You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/12/15 22:51:14 UTC

[1/2] cassandra git commit: Fix CHANGES.txt for 3.0.3

Repository: cassandra
Updated Branches:
  refs/heads/trunk bab66dd1a -> 80250aa01


Fix CHANGES.txt for 3.0.3


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

Branch: refs/heads/trunk
Commit: 98178f53ac5d0525b63631b9fb359f43a14cde24
Parents: 1deb044
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Dec 15 21:46:58 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Dec 15 21:47:18 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/98178f53/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e167126..dd1896c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,5 @@
-3.0.2
- * Fix upgrade data loss due to range tombstone deleting more data than then should
-   (CASSANDRA-10822)
-Merged from 2.2
+3.0.3
+Merged from 2.2:
  * Add property to allow listening on broadcast interface (CASSANDRA-9748)
  * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
  * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
@@ -15,6 +13,11 @@ Merged from 2.1:
  * Allow cancellation of index summary redistribution (CASSANDRA-8805)
 
 
+3.0.2
+ * Fix upgrade data loss due to range tombstone deleting more data than then should
+   (CASSANDRA-10822)
+
+
 3.0.1
  * Avoid MV race during node decommission (CASSANDRA-10674)
  * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)


[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk

Posted by al...@apache.org.
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/80250aa0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/80250aa0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/80250aa0

Branch: refs/heads/trunk
Commit: 80250aa015adfd17791a78dc23ba1b1067f02104
Parents: bab66dd 98178f5
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Dec 15 21:51:05 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Dec 15 21:51:05 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/80250aa0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b3dc35b,dd1896c..062ab10
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,10 +1,26 @@@
 -3.0.3
 +3.2
 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
 + * Sort compactionhistory output by timestamp (CASSANDRA-10464)
 + * More efficient BTree removal (CASSANDRA-9991)
 + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
 + * Group pending compactions based on table (CASSANDRA-10718)
 + * Add compressor name in sstablemetadata output (CASSANDRA-9879)
 + * Fix type casting for counter columns (CASSANDRA-10824)
 + * Prevent running Cassandra as root (CASSANDRA-8142)
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes (CASSANDRA-8639)
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created (CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
- Merged from 3.0:
-  * Fix upgrade data loss due to range tombstone deleting more data than then should
-    (CASSANDRA-10822)
- Merged from 2.2
+ Merged from 2.2:
   * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 - * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
  Merged from 2.1:
   * (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
   * Allow CREATE TABLE WITH ID (CASSANDRA-9179)
@@@ -32,8 -13,12 +29,14 @@@
   * Allow cancellation of index summary redistribution (CASSANDRA-8805)
  
  
 -3.0.2
 - * Fix upgrade data loss due to range tombstone deleting more data than then should
 -   (CASSANDRA-10822)
++3.1.1
++Merged from 3.0:
++  * Fix upgrade data loss due to range tombstone deleting more data than then should
++    (CASSANDRA-10822)
+ 
+ 
 -3.0.1
 +3.1
 +Merged from 3.0:
   * Avoid MV race during node decommission (CASSANDRA-10674)
   * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
   * Handle single-column deletions correction in materialized views