cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [6/6] git commit: Merge branch 'cassandra-1.2' into trunk
Date Thu, 10 Jan 2013 18:52:16 GMT
Updated Branches:
  refs/heads/cassandra-1.1 f481a3916 -> ccdb632d4
  refs/heads/cassandra-1.2 1b41d6fea -> a1b601e43
  refs/heads/trunk eebf3fb15 -> 02b515766


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

Branch: refs/heads/trunk
Commit: 02b515766e2d11dc7f4e6078fe3d5fef1dbe2368
Parents: eebf3fb a1b601e
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Jan 10 12:52:12 2013 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Jan 10 12:52:12 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../apache/cassandra/thrift/ThriftValidation.java  |    7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02b51576/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e15b4c8,63c0b1d..885eded
--- 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)
 +
 +
  1.2.1
+  * re-allow wrapping ranges for start_token/end_token range pairing (CASSANDRA-5106)
   * fix validation compaction of empty rows (CASSADRA-5136)
   * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
   * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/02b51576/src/java/org/apache/cassandra/thrift/ThriftValidation.java
----------------------------------------------------------------------


Mime
View raw message