cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Wed, 21 May 2014 18:11:33 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/decc3088
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/decc3088
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/decc3088

Branch: refs/heads/trunk
Commit: decc308888f726b4301e60aabbc2db4baab2f7c4
Parents: 9174102 e00878d
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed May 21 13:11:22 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed May 21 13:11:22 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 conf/cassandra.yaml                                          | 4 ++--
 src/java/org/apache/cassandra/config/Config.java             | 2 +-
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/decc3088/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a74207f,61ea788..7e43fdf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +3.0
 + * 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-7208)
 + * Make incremental repair default (CASSANDRA-7250)
 +
  2.1.0-rc1
+  * Change concurrent_compactors defaults (CASSANDRA-7139)
   * Add PowerShell Windows launch scripts (CASSANDRA-7001)
   * Make commitlog archive+restore more robust (CASSANDRA-6974)
   * Fix marking commitlogsegments clean (CASSANDRA-6959)

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


Mime
View raw message