cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 29 May 2014 21:39:42 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/feccbc8e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/feccbc8e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/feccbc8e

Branch: refs/heads/trunk
Commit: feccbc8e474d4a11fd6caba4b34a80b5079d573f
Parents: 62b3c1e ee950b4
Author: belliottsmith <github@sub.laerad.com>
Authored: Thu May 29 22:39:25 2014 +0100
Committer: belliottsmith <github@sub.laerad.com>
Committed: Thu May 29 22:39:25 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 conf/cassandra.yaml                             | 10 +--
 .../org/apache/cassandra/config/Config.java     |  1 -
 .../cassandra/config/DatabaseDescriptor.java    | 10 ---
 .../org/apache/cassandra/db/Directories.java    | 81 ++++++--------------
 src/java/org/apache/cassandra/db/Memtable.java  |  5 --
 .../db/compaction/AbstractCompactionTask.java   |  5 --
 .../db/compaction/CompactionManager.java        |  4 +-
 .../cassandra/db/compaction/Scrubber.java       |  2 +-
 .../cassandra/io/util/DiskAwareRunnable.java    |  4 +-
 .../cassandra/streaming/StreamReader.java       |  3 +-
 .../cassandra/streaming/StreamReceiveTask.java  |  3 +-
 .../cassandra/db/ColumnFamilyStoreTest.java     | 14 ++--
 .../apache/cassandra/db/DirectoriesTest.java    | 16 ++--
 .../io/sstable/SSTableSimpleWriterTest.java     |  2 +-
 15 files changed, 48 insertions(+), 113 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/feccbc8e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 75d8533,6854392..cdfd507
--- 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
+  * Revert flush directory (CASSANDRA-6357)
   * More efficient executor service for fast operations (CASSANDRA-4718)
   * Move less common tools into a new cassandra-tools package (CASSANDRA-7160)
   * Support more concurrent requests in native protocol (CASSANDRA-7231)

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


Mime
View raw message