cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Wed, 10 Jun 2015 08:16:50 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/964b2eb7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/964b2eb7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/964b2eb7

Branch: refs/heads/trunk
Commit: 964b2eb71e63c8e265d98ec4fb0a11f7cb0fc924
Parents: 89afc95 79a9d43
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Wed Jun 10 10:15:48 2015 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Jun 10 10:15:48 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  2 -
 .../db/compaction/CompactionManager.java        | 40 ++++++++++----------
 3 files changed, 20 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/964b2eb7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 144252d,b94279b..037f785
--- 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
+  * Make sure we cancel non-compacting sstables from LifecycleTransaction (CASSANDRA-9566)
   * Compressed commit log should measure compressed space used (CASSANDRA-9095)
   * Fix comparison bug in CassandraRoleManager#collectRoles (CASSANDRA-9551)
   * Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/964b2eb7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/964b2eb7/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------


Mime
View raw message