You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/06/27 18:09:16 UTC
[6/6] git commit: merge from 2.1.0
merge from 2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e7ed617
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e7ed617
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e7ed617
Branch: refs/heads/trunk
Commit: 8e7ed6175400fc68c082b58f54e102911b968ca9
Parents: 0494e8f e7dbdd8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Jun 27 11:09:06 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Jun 27 11:09:06 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 6 +++++-
bin/cassandra.bat | 2 +-
bin/cassandra.ps1 | 2 +-
conf/cassandra-env.ps1 | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e7ed617/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c821ce1,7de31c5..343bb98
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,10 +1,23 @@@
+3.0
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * 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)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+
+
- 2.1.0
+ 2.1.1
* Improve schema merge performance (CASSANDRA-7444)
* Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
+
+
+ 2.1.0
+ * (Windows) handle spaces in path names (CASSANDRA-7451)
Merged from 2.0:
* Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
* Support DISTINCT for static columns and fix behaviour when DISTINC is