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, 07 May 2014 21:53:49 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/d6eb9e8b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6eb9e8b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6eb9e8b

Branch: refs/heads/trunk
Commit: d6eb9e8bd4dd523bae757840042d3194456e5748
Parents: c37ccee ce7bf5e
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed May 7 16:53:40 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed May 7 16:53:40 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 23 +++++++++++++++++++-
 .../org/apache/cassandra/db/Directories.java    |  5 +++++
 .../apache/cassandra/io/sstable/Descriptor.java | 13 +++++++++++
 4 files changed, 41 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6eb9e8b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 067632f,fc5786b..0f7012c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +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)
 +
  2.1.0-rc1
+  * Add snapshot "manifest" describing files included (CASSANDRA-6326)
   * Parallel streaming for sstableloader (CASSANDRA-3668)
   * Fix bugs in supercolumns handling (CASSANDRA-7138)
   * Fix ClassClassException on composite dense tables (CASSANDRA-7112)


Mime
View raw message