cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Date Wed, 16 Jan 2013 00:43:35 GMT
Updated Branches:
  refs/heads/cassandra-1.2 fac299f8a -> 1108ede0f
  refs/heads/trunk c83110609 -> acbff934f


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

Branch: refs/heads/trunk
Commit: acbff934f738e9bde39f73b8ac865a836f54691b
Parents: c831106 1108ede
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Jan 15 18:43:24 2013 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue Jan 15 18:43:24 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 src/java/org/apache/cassandra/db/SystemTable.java  |   20 +++++++++++++++
 .../locator/GossipingPropertyFileSnitch.java       |   15 +++++++++++
 3 files changed, 36 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/acbff934/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 944c508,e3e40b6..5cd8fe9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +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)
 + * replace supercolumns internally by composites (CASSANDRA-3237)
 + * upgrade thrift to 0.9.0 (CASSANDRA-3719)
 +
  1.2.1
+  * GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133)
   * drain should flush system CFs too (CASSANDRA-4446)
   * add inter_dc_tcp_nodelay setting (CASSANDRA-5148)
   * re-allow wrapping ranges for start_token/end_token range pairing (CASSANDRA-5106)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/acbff934/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------


Mime
View raw message