You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/05/05 18:53:36 UTC
[11/12] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6224118
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6224118
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6224118
Branch: refs/heads/trunk
Commit: b62241182fd8c4c9f22e95e3b45b92bb39b368c1
Parents: 3aa41fb 8bbe901
Author: Brandon Williams <br...@apache.org>
Authored: Mon May 5 11:49:23 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon May 5 11:49:23 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../service/ScheduledRangeTransferExecutorService.java | 6 +++---
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6224118/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2f55eee,25a5cc1..86b261d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,18 +1,10 @@@
-2.0.8
+2.1.0-rc1
+ * Parallel streaming for sstableloader (CASSANDRA-3668)
+ * Fix bugs in supercolumns handling (CASSANDRA-7138)
+ * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
+Merged from 2.0:
+ * Correctly delete scheduled range xfers (CASSANDRA-7143)
* Make batchlog replica selection rack-aware (CASSANDRA-6551)
- * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
- * Set JMX RMI port to 7199 (CASSANDRA-7087)
- * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
- * Log a warning for large batches (CASSANDRA-6487)
- * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
- * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
- * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
- * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
- * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
- * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
- * Re-add parameter columns to tracing session (CASSANDRA-6942)
- * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
* Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6224118/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 5684eea,595a7e7..f1be0c2
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -3193,7 -3105,7 +3193,7 @@@ public class StorageService extends Not
private class RangeRelocator
{
- private final StreamPlan streamPlan = new StreamPlan("Bootstrap");
- private StreamPlan streamPlan = new StreamPlan("Relocation");
++ private final StreamPlan streamPlan = new StreamPlan("Relocation");
private RangeRelocator(Collection<Token> tokens, List<String> keyspaceNames)
{