cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/7] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Date Mon, 25 Aug 2014 14:01:53 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1.0

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/63c21a32
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63c21a32
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63c21a32

Branch: refs/heads/trunk
Commit: 63c21a32ddb69b5d797a6256d292329b708e4194
Parents: baae9b6 5d4740c
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Aug 25 15:57:43 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Aug 25 15:57:43 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  4 ++++
 .../apache/cassandra/service/StorageProxy.java  | 24 +++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/63c21a32/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d7c3dea,4d5d851..15e41da
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,10 +1,15 @@@
 -2.0.11:
 +2.1.0
 + * Correctly remove tmplink files (CASSANDRA-7803)
 + * (cqlsh) Fix column name formatting for functions, CAS operations,
 +   and UDT field selections (CASSANDRA-7806)
 + * (cqlsh) Fix COPY FROM handling of null/empty primary key
 +   values (CASSANDRA-7792)
 + * Fix ordering of static cells (CASSANDRA-7763)
 +Merged from 2.0:
+  * Always send Paxos commit to all replicas (CASSANDRA-7479)
 -
 -2.0.10
+  * Don't send schema change responses and events for no-op DDL
+    statements (CASSANDRA-7600)
+  * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
   * Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753)
   * Fix ALTER clustering column type from DateType to TimestampType when
     using DESC clustering order (CASSANRDA-7797)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/63c21a32/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------


Mime
View raw message