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 2014/08/12 18:20:59 UTC
[1/4] git commit: Fix MS expiring map timeout for CAS messages
Repository: cassandra
Updated Branches:
refs/heads/trunk f774b2a93 -> 56adc4429
Fix MS expiring map timeout for CAS messages
patch by kohlisankalp; reviewed by slebresne for CASSANDRA-7752
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f7e88033
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7e88033
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7e88033
Branch: refs/heads/trunk
Commit: f7e88033452ae2fee18a4fc4ec104d14bbddefbe
Parents: 6caf426
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Aug 12 18:16:54 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Aug 12 18:18:18 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7e88033/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fc32426..d42c100 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.10
+ * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
* Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
* Give CRR a default input_cql Statement (CASSANDRA-7226)
* Better error message when adding a collection with the same name
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7e88033/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7987193..3162fd1 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -829,6 +829,9 @@ public class DatabaseDescriptor
return getTruncateRpcTimeout();
case READ_REPAIR:
case MUTATION:
+ case PAXOS_COMMIT:
+ case PAXOS_PREPARE:
+ case PAXOS_PROPOSE:
case COUNTER_MUTATION:
return getWriteRpcTimeout();
default:
[4/4] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by sl...@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/56adc442
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56adc442
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56adc442
Branch: refs/heads/trunk
Commit: 56adc4429f081a5e81988b54dc8fe4c4c420d1c4
Parents: f774b2a 3060ccc
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Aug 12 18:20:53 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Aug 12 18:20:53 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56adc442/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56adc442/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
[2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fbe7b909
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbe7b909
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbe7b909
Branch: refs/heads/trunk
Commit: fbe7b909be2ab187d73bcf3d4b6dfcbba7c3d629
Parents: 0471f40 f7e8803
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Aug 12 18:20:14 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Aug 12 18:20:14 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbe7b909/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7e04bcb,d42c100..2970632
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
-2.0.10
+2.1.0-rc6
+ * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
+ * Remove netty buffer ref-counting (CASSANDRA-7735)
+ * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
+ * Include stress yaml example in release and deb (CASSANDRA-7717)
+ * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695)
+ * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
+ * Fix binding null values inside UDT (CASSANDRA-7685)
+ * Fix UDT field selection with empty fields (CASSANDRA-7670)
+ * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
+Merged from 2.0:
+ * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752)
* Do not flush on truncate if durable_writes is false (CASSANDRA-7750)
* Give CRR a default input_cql Statement (CASSANDRA-7226)
* Better error message when adding a collection with the same name
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbe7b909/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index d1511ba,3162fd1..b4ba643
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -925,9 -829,11 +925,12 @@@ public class DatabaseDescripto
return getTruncateRpcTimeout();
case READ_REPAIR:
case MUTATION:
+ case PAXOS_COMMIT:
+ case PAXOS_PREPARE:
+ case PAXOS_PROPOSE:
- case COUNTER_MUTATION:
return getWriteRpcTimeout();
+ case COUNTER_MUTATION:
+ return getCounterWriteRpcTimeout();
default:
return getRpcTimeout();
}
[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3060ccc9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3060ccc9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3060ccc9
Branch: refs/heads/trunk
Commit: 3060ccc9a2f849c9b5525d382d5fad9c6439bbc7
Parents: d71c8aa fbe7b90
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Aug 12 18:20:41 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Aug 12 18:20:41 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3060ccc9/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3060ccc9/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------