cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Mon, 22 Jun 2015 21:29: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/115ed236
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/115ed236
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/115ed236

Branch: refs/heads/trunk
Commit: 115ed236aa041529897065f0b18a0bfd0f656189
Parents: c31ecba d6d32d2
Author: Josh McKenzie <josh.mckenzie@datastax.com>
Authored: Mon Jun 22 17:27:46 2015 -0400
Committer: Josh McKenzie <josh.mckenzie@datastax.com>
Committed: Mon Jun 22 17:27:46 2015 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 conf/cassandra.yaml                             |  7 +++
 .../org/apache/cassandra/config/Config.java     |  2 +
 .../cassandra/config/DatabaseDescriptor.java    |  5 ++
 .../cassandra/service/CassandraDaemon.java      |  7 +++
 .../cassandra/service/StorageService.java       |  7 +++
 .../org/apache/cassandra/transport/Server.java  |  1 -
 .../apache/cassandra/utils/WindowsTimer.java    | 65 ++++++++++++++++++++
 .../src/org/apache/cassandra/stress/Stress.java |  7 +++
 9 files changed, 101 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/115ed236/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c2c62ae,16fe569..f15a263
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,15 -1,5 +1,16 @@@
 +3.0:
 + * Add nodetool command to replay batchlog (CASSANDRA-9547)
 + * 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)
 + * undeprecate cache recentHitRate (CASSANDRA-6591)
 +
 +
  2.2
+  * Change Windows kernel default timer resolution (CASSANDRA-9634)
   * Deprected sstable2json and json2sstable (CASSANDRA-9618)
   * Allow native functions in user-defined aggregates (CASSANDRA-9542)
   * Don't repair system_distributed by default (CASSANDRA-9621)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/115ed236/conf/cassandra.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/115ed236/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/115ed236/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/115ed236/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------

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


Mime
View raw message