cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/3] git commit: Merge branch 'cassandra-1.2' into trunk
Date Wed, 19 Dec 2012 20:56:41 GMT
Updated Branches:
  refs/heads/cassandra-1.2 bebaf453c -> de2495c2c
  refs/heads/trunk 8e7abe0ad -> ff92111c0


Merge branch 'cassandra-1.2' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff92111c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff92111c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff92111c

Branch: refs/heads/trunk
Commit: ff92111c0164f3c9aef61295681f80645674402f
Parents: 8e7abe0 de2495c
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Dec 19 14:56:26 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Dec 19 14:56:26 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../org/apache/cassandra/net/MessagingService.java |    2 +-
 .../org/apache/cassandra/service/StorageProxy.java |  187 ++++++++++-----
 3 files changed, 125 insertions(+), 65 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ff92111c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index efda024,d8caa14..86fae7c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +1.3
 + * make index_interval configurable per columnfamily (CASSANDRA-3961)
 + * add default_tim_to_live (CASSANDRA-3974)
 + * add memtable_flush_period_in_ms (CASSANDRA-4237)
 +
 +
  1.2.1
+  * fix hinting for dropped local writes (CASSANDRA-4753)
   * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
   * apply disk_failure_policy to bad disks on initial directory creation 
     (CASSANDRA-4847)

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


Mime
View raw message