cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Mon, 15 Sep 2014 13:53:40 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: e225176b31413c3c5f31885eac364fa06deaca2e
Parents: fb6c285 094aa8e
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Mon Sep 15 06:53:18 2014 +0000
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Mon Sep 15 06:53:18 2014 +0000

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 8 ++++++++
 2 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e225176b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1e08d3c,608e4b1..bf3567f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,26 -1,5 +1,27 @@@
 +3.0
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Support Java source code for user-defined functions (CASSANDRA-7562)
 + * Require arg types to disambiguate UDF drops (CASSANDRA-7812)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Verify that UDF class methods are static (CASSANDRA-7781)
 + * Support pure user-defined functions (CASSANDRA-7395, 7740)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 +
 +
  2.1.1
+  * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
   * cassandra-stress supports whitelist mode for node config
   * GCInspector more closely tracks GC; cassandra-stress and nodetool report it
   * nodetool won't output bogus ownership info without a keyspace (CASSANDRA-7173)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e225176b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message