You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/05/27 10:30:31 UTC
[1/3] git commit: Copy compaction options to make sure they are
reloaded.
Repository: cassandra
Updated Branches:
refs/heads/trunk f5ee620bf -> 8ffb9cc3f
Copy compaction options to make sure they are reloaded.
Patch by pauloricardomg; reviewed by marcuse for CASSANDRA-7290
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9376fddc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9376fddc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9376fddc
Branch: refs/heads/trunk
Commit: 9376fddccf202ec0506f2a94eb0a4f6bdf4a2852
Parents: ea5b624
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue May 27 10:24:48 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue May 27 10:24:48 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/compaction/AbstractCompactionStrategy.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9376fddc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b8c3963..42a1148 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@
* Add missing iso8601 patterns for date strings (6973)
* Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
* cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
+ * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
2.0.8
* Always reallocate buffers in HSHA (CASSANDRA-6285)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9376fddc/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
index 276802f..0a857b3 100644
--- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.db.compaction;
import java.util.*;
import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.util.concurrent.RateLimiter;
import org.slf4j.Logger;
@@ -76,7 +77,7 @@ public abstract class AbstractCompactionStrategy
{
assert cfs != null;
this.cfs = cfs;
- this.options = options;
+ this.options = ImmutableMap.copyOf(options);
/* checks must be repeated here, as user supplied strategies might not call validateOptions directly */
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ma...@apache.org.
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/8ffb9cc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ffb9cc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ffb9cc3
Branch: refs/heads/trunk
Commit: 8ffb9cc3f13c2b02bd8b01ae15061c820f7bb217
Parents: f5ee620 8602fe8
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue May 27 10:29:22 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue May 27 10:29:22 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/compaction/AbstractCompactionStrategy.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ffb9cc3/CHANGES.txt
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by ma...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8602fe8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8602fe8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8602fe8c
Branch: refs/heads/trunk
Commit: 8602fe8ce85cf89319724cae84bc43912de1eb44
Parents: 7f930e0 9376fdd
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue May 27 10:29:03 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Tue May 27 10:29:03 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/compaction/AbstractCompactionStrategy.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8602fe8c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9bde1f3,42a1148..fcc1e73
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,10 +1,32 @@@
-2.0.9
- * Add missing iso8601 patterns for date strings (6973)
- * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
- * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
+2.1.0-rc1
+ * Add tab-completion to debian nodetool packaging (CASSANDRA-6421)
+ * Change concurrent_compactors defaults (CASSANDRA-7139)
+ * Add PowerShell Windows launch scripts (CASSANDRA-7001)
+ * Make commitlog archive+restore more robust (CASSANDRA-6974)
+ * Fix marking commitlogsegments clean (CASSANDRA-6959)
+ * 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)
+ * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
+ * Upgrade NBHM lib (CASSANDRA-7128)
+ * Optimize netty server (CASSANDRA-6861)
+ * Fix repair hang when given CF does not exist (CASSANDRA-7189)
+ * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
+ * Add server side batching to native transport (CASSANDRA-5663)
+ * Make batchlog replay asynchronous (CASSANDRA-6134)
+ * remove unused classes (CASSANDRA-7197)
+ * Limit user types to the keyspace they are defined in (CASSANDRA-6643)
+ * Add validate method to CollectionType (CASSANDRA-7208)
+ * New serialization format for UDT values (CASSANDRA-7209, CASSANDRA-7261)
+ * Fix nodetool netstats (CASSANDRA-7270)
+ * Fix potential ClassCastException in HintedHandoffManager (CASSANDRA-7284)
+ * Use prepared statements internally (CASSANDRA-6975)
+ * Fix broken paging state with prepared statement (CASSANDRA-7120)
+ * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287)
+ * Allow nulls/non-existant fields in UDT (CASSANDRA-7206)
+Merged from 2.0:
+ * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
-
-2.0.8
* Always reallocate buffers in HSHA (CASSANDRA-6285)
* (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
* (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8602fe8c/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
----------------------------------------------------------------------