cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Wed, 27 May 2015 17:04:57 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/e9a263da
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9a263da
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9a263da

Branch: refs/heads/trunk
Commit: e9a263dae5aab0543a11aa2248f001de6a59900d
Parents: 3c98472 f9c998c
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Wed May 27 12:04:42 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Wed May 27 12:04:42 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                         | 2 ++
 conf/commitlog_archiving.properties | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9a263da/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e5c84ab,e183137..bba4d43
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,6 +1,11 @@@
 +3.0:
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 +
 +
  2.2
+  * Update commitlog archiving examples now that commitlog segments are
+    not recycled (CASSANDRA-9350)
   * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568)
   * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399)
   * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)


Mime
View raw message