cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Date Thu, 13 Feb 2014 16:34:43 GMT
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/21de3328
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21de3328
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21de3328

Branch: refs/heads/trunk
Commit: 21de3328aad87e10ad4301b1c198022e57fecaa8
Parents: 79c6ecc 78df8a3
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu Feb 13 19:34:31 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu Feb 13 19:34:31 2014 +0300

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/net/IncomingTcpConnection.java    |  4 +--
 .../apache/cassandra/net/MessagingService.java  | 28 +++++++++++++-------
 .../cassandra/service/MigrationManager.java     |  4 +--
 4 files changed, 23 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/21de3328/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 139eb06,7425625..0af5555
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -52,8 -20,8 +52,9 @@@ Merged from 1.2
   * Compact hints after partial replay to clean out tombstones (CASSANDRA-6666)
   * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649)
   * Don't exchange schema between nodes with different versions (CASSANDRA-6695)
+  * Use real node messaging versions for schema exchange decisions (CASSANDRA-6700)
  
 +
  2.0.5
   * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609)
   * Add ks.cf names to tombstone logging (CASSANDRA-6597)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/21de3328/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/21de3328/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/21de3328/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------


Mime
View raw message