cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Thu, 11 Jun 2015 09:06:09 GMT
Merge branch 'cassandra-2.2' into trunk


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

Branch: refs/heads/trunk
Commit: 4d3562f6103b83bd9e8b8f7a324a78aeb39be754
Parents: a91d1c9 ef8a9f8
Author: Robert Stupp <snazy@snazy.de>
Authored: Thu Jun 11 11:05:43 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Thu Jun 11 11:05:43 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d3562f6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ca5ae48,4d4293c..377527e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +3.0:
 + * Make file buffer cache independent of paths being read (CASSANDRA-8897)
 + * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 + * Populate TokenMetadata early during startup (CASSANDRA-9317)
 +
 +
  2.2
+  * Add functions to convert timeuuid to date or time, deprecate dateOf and unixTimestampOf
(CASSANDRA-9229)
   * Make sure we cancel non-compacting sstables from LifecycleTransaction (CASSANDRA-9566)
  
  
@@@ -33,8 -25,8 +34,7 @@@
   * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429)
   * Add ability to stop compaction by ID (CASSANDRA-7207)
   * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438)
-  * Add functions to convert timeuuid to date or time, deprecate dateOf and unixTimestampOf
(CASSANDRA-9229)
  Merged from 2.1:
 - * Make nodetool exit with non-0 status on failure (CASSANDRA-9569)
   * (cqlsh) Fix using COPY through SOURCE or -f (CASSANDRA-9083)
   * Fix occasional lack of `system` keyspace in schema tables (CASSANDRA-8487)
   * Use ProtocolError code instead of ServerError code for native protocol


Mime
View raw message