cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [11/19] git commit: Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Date Tue, 22 Apr 2014 12:34:47 GMT
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/364282a7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/364282a7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/364282a7

Branch: refs/heads/cassandra-2.1
Commit: 364282a7d43c475b82fc169cec751fba899e3101
Parents: cdfe4e0 48d7e40
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Apr 22 07:20:32 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Apr 22 07:20:32 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  14 ++-
 doc/cql3/CQL.textile                            |  16 ++-
 pylib/cqlshlib/cql3handling.py                  |  24 +++--
 .../apache/cassandra/cql3/QueryProcessor.java   |   2 +-
 .../cql3/statements/BatchStatement.java         |   3 +-
 .../cql3/statements/SelectStatement.java        |  34 ++++---
 .../apache/cassandra/db/BatchlogManager.java    | 102 +++++++++++--------
 .../apache/cassandra/db/ColumnFamilyStore.java  |   6 --
 .../cassandra/db/HintedHandOffManager.java      |  21 +---
 .../org/apache/cassandra/db/SystemKeyspace.java |  60 +++++++----
 .../db/commitlog/CommitLogReplayer.java         |  12 +--
 .../apache/cassandra/service/StorageProxy.java  |   9 +-
 .../cassandra/service/pager/QueryPager.java     |   2 +-
 .../org/apache/cassandra/tools/NodeCmd.java     |   5 +-
 .../apache/cassandra/tools/NodeToolHelp.yaml    |   2 +-
 .../cassandra/db/BatchlogManagerTest.java       |  78 ++++++++++++--
 .../apache/cassandra/db/HintedHandOffTest.java  |  19 ++--
 17 files changed, 272 insertions(+), 137 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/364282a7/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 01830ef,5d47cfa..791586c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,15 +1,16 @@@
+ 2.0.8
+  * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
+  * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
+ Merged from 1.2:
+  * Fix batchlog to account for CF truncation records (CASSANDRA-6999)
+  * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
+  * Require nodetool rebuild_index to specify index names (CASSANDRA-7038)
+ 
+ 
  2.0.7
   * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
 - * Allow compaction of system tables during startup (CASSANDRA-6913)
 + * Avoid early loading of non-system keyspaces before compaction-leftovers 
 +   cleanup at startup (CASSANDRA-6913)
   * Restrict Windows to parallel repairs (CASSANDRA-6907)
   * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436)
   * Fix NPE in MeteredFlusher (CASSANDRA-6820)


Mime
View raw message