You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/11/15 15:42:54 UTC
[1/3] git commit: Make the CL native protocol code match the on in 2.0
Updated Branches:
refs/heads/trunk c41eedf22 -> fab27bd59
Make the CL native protocol code match the on in 2.0
patch by slebresne; reviewed by jasobrown for CASSANDRA-6347
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9d7b5671
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d7b5671
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d7b5671
Branch: refs/heads/trunk
Commit: 9d7b5671ff725cb5e2749bac763bc6f5f5fd99dd
Parents: 4c08800
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Nov 15 15:36:22 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Nov 15 15:36:22 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/db/ConsistencyLevel.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d7b5671/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 39a88f8..9ee6657 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,8 @@
* Fix missing one row in reverse query (CASSANDRA-6330)
* Fix reading expired row value from row cache (CASSANDRA-6325)
* Fix AssertionError when doing set element deletion (CASSANDRA-6341)
+ * Make CL code for the native protocol match the one in C* 2.0
+ (CASSANDRA-6347)
1.2.11
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9d7b5671/src/java/org/apache/cassandra/db/ConsistencyLevel.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ConsistencyLevel.java b/src/java/org/apache/cassandra/db/ConsistencyLevel.java
index 25fb25b..4d72767 100644
--- a/src/java/org/apache/cassandra/db/ConsistencyLevel.java
+++ b/src/java/org/apache/cassandra/db/ConsistencyLevel.java
@@ -48,7 +48,7 @@ public enum ConsistencyLevel
ALL (5),
LOCAL_QUORUM(6, true),
EACH_QUORUM (7),
- LOCAL_ONE (8, true);
+ LOCAL_ONE (10, true);
private static final Logger logger = LoggerFactory.getLogger(ConsistencyLevel.class);
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by sl...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/db/ConsistencyLevel.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09b2470b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09b2470b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09b2470b
Branch: refs/heads/trunk
Commit: 09b2470b33c47d14e4f6ef6befd4eb8f9ec5aacf
Parents: 6fe83cd 9d7b567
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Nov 15 15:41:38 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Nov 15 15:41:38 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/db/ConsistencyLevel.java | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09b2470b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 17e97d5,9ee6657..b6d2e73
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -42,42 -18,11 +42,44 @@@ Merged from 1.2
* Fix missing one row in reverse query (CASSANDRA-6330)
* Fix reading expired row value from row cache (CASSANDRA-6325)
* Fix AssertionError when doing set element deletion (CASSANDRA-6341)
+ * Make CL code for the native protocol match the one in C* 2.0
+ (CASSANDRA-6347)
-1.2.11
+2.0.2
+ * Update FailureDetector to use nanontime (CASSANDRA-4925)
+ * Fix FileCacheService regressions (CASSANDRA-6149)
+ * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
+ * Fix race conditions in bulk loader (CASSANDRA-6129)
+ * Add configurable metrics reporting (CASSANDRA-4430)
+ * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
+ * Track and persist sstable read activity (CASSANDRA-5515)
+ * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194)
+ * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
+ * Fix insertion of collections with CAS (CASSANDRA-6069)
+ * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
+ * Track clients' remote addresses in ClientState (CASSANDRA-6070)
+ * Create snapshot dir if it does not exist when migrating
+ leveled manifest (CASSANDRA-6093)
+ * make sequential nodetool repair the default (CASSANDRA-5950)
+ * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
+ * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
+ * Delete can potentially be skipped in batch (CASSANDRA-6115)
+ * Allow alter keyspace on system_traces (CASSANDRA-6016)
+ * Disallow empty column names in cql (CASSANDRA-6136)
+ * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383)
+ * Save compaction history to system keyspace (CASSANDRA-5078)
+ * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166)
+ * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
+ * Add reloadtriggers command to nodetool (CASSANDRA-4949)
+ * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
+ * Fix sstable loader (CASSANDRA-6205)
+ * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
+ * Fix NPE while loading paxos state (CASSANDRA-6211)
+ * cqlsh: add SHOW SESSION <tracing-session> command (CASSANDRA-6228)
+Merged from 1.2:
+ * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
* Add a warning for small LCS sstable size (CASSANDRA-6191)
* Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191)
* Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/09b2470b/src/java/org/apache/cassandra/db/ConsistencyLevel.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ConsistencyLevel.java
index 4fffc8a,4d72767..cbb4bb1
--- a/src/java/org/apache/cassandra/db/ConsistencyLevel.java
+++ b/src/java/org/apache/cassandra/db/ConsistencyLevel.java
@@@ -37,7 -37,7 +37,6 @@@ import org.apache.cassandra.locator.Abs
import org.apache.cassandra.locator.NetworkTopologyStrategy;
import org.apache.cassandra.transport.ProtocolException;
--
public enum ConsistencyLevel
{
ANY (0),
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fab27bd5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fab27bd5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fab27bd5
Branch: refs/heads/trunk
Commit: fab27bd59792b1e00cf7b6bc6035f2a86891bd9c
Parents: c41eedf 09b2470
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Nov 15 15:42:09 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Nov 15 15:42:09 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/db/ConsistencyLevel.java | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fab27bd5/CHANGES.txt
----------------------------------------------------------------------