cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Sun, 14 Sep 2014 08:13:59 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/14b1c960
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14b1c960
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14b1c960

Branch: refs/heads/trunk
Commit: 14b1c96072dfdfccb8c1a2c10e8feb4b8189846f
Parents: 477c54c eea042b
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Sun Sep 14 09:13:44 2014 +0100
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Sun Sep 14 09:13:44 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/stress/settings/SettingsNode.java | 47 ++++++++++++++-
 .../stress/settings/StressSettings.java         |  5 +-
 .../cassandra/stress/util/JavaDriverClient.java | 16 ++++-
 .../stress/util/SmartThriftClient.java          | 62 ++++++++++++++------
 5 files changed, 106 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/14b1c960/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e9d48e9,7e18719..1e08d3c
--- 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
+  * 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)
   * Add human readable option to nodetool commands (CASSANDRA-5433)


Mime
View raw message