cassandra-commits mailing list archives

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

Branch: refs/heads/trunk
Commit: 5c31a8633485493fec392ebcb9d950b57745e456
Parents: e211008 f88b621
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Mon Jun 29 07:12:13 2015 -0700
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Mon Jun 29 07:12:13 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                         | 1 +
 src/java/org/apache/cassandra/tools/BulkLoader.java | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c31a863/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ff80121,fe71ea7..206b15d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 +3.0:
 + * Improve log output from unit tests (CASSANDRA-9528)
 + * Add algorithmic token allocation (CASSANDRA-7032)
 + * 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
+  * BulkLoader has --transport-factory option but does not use it (CASSANDRA-9675)
   * Allow JMX over SSL directly from nodetool (CASSANDRA-9090)
   * Update cqlsh for UDFs (CASSANDRA-7556)
   * Change Windows kernel default timer resolution (CASSANDRA-9634)


Mime
View raw message