cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Date Tue, 12 Aug 2014 16:20:24 GMT
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/cassandra-2.1.0
Commit: fbe7b909be2ab187d73bcf3d4b6dfcbba7c3d629
Parents: 0471f40 f7e8803
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Aug 12 18:20:14 2014 +0200
Committer: Sylvain Lebresne <sylvain@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();
          }


Mime
View raw message