cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 27 Jun 2014 09:30:13 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/39bdd3b0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39bdd3b0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39bdd3b0

Branch: refs/heads/trunk
Commit: 39bdd3b081b60ffe8a41fa8bf776a598987c69cb
Parents: beea5d6 9da949b
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Jun 27 02:29:09 2014 -0700
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Jun 27 02:29:09 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../org/apache/cassandra/config/KSMetaData.java |  2 +-
 .../org/apache/cassandra/db/DefsTables.java     | 18 +++++++++-----
 .../org/apache/cassandra/db/SystemKeyspace.java | 25 ++++++++++++++------
 .../cassandra/service/MigrationManager.java     |  2 +-
 5 files changed, 33 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/39bdd3b0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index dad329f,64f2bee..4308f71
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 +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
+  * Improve schema merge performance (CASSANDRA-7444)
  Merged from 2.0:
   * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
   * Support DISTINCT for static columns and fix behaviour when DISTINC is

http://git-wip-us.apache.org/repos/asf/cassandra/blob/39bdd3b0/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------


Mime
View raw message