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 Tue, 26 Feb 2013 16:08:32 GMT
Updated Branches:
  refs/heads/cassandra-1.2 88b9d9516 -> a4166496f
  refs/heads/trunk 7d5490b58 -> c5f9ac87f


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

Branch: refs/heads/trunk
Commit: c5f9ac87f6478d71ea22ad1f7e9e46f9aae9c8c8
Parents: 635e213 a416649
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Feb 26 10:07:56 2013 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Feb 26 10:07:56 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 +
 .../db/compaction/LeveledCompactionStrategy.java   |    2 +-
 .../io/sstable/SSTableBoundedScanner.java          |   16 ++---
 .../apache/cassandra/io/sstable/SSTableReader.java |   54 ++++++++++++++-
 4 files changed, 60 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5f9ac87/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index badc87c,b19b092..fcd2115
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,6 +1,19 @@@
 +1.3
 + * Move sstable level information into the Stats component, removing the
 +   need for a separate Manifest file (CASSANDRA-4872)
 + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199)
 + * 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, 5123)
 + * upgrade thrift to 0.9.0 (CASSANDRA-3719)
 + * drop unnecessary keyspace from user-defined compaction API (CASSANDRA-5139)
 + * more robust solution to incomplete compactions + counters (CASSANDRA-5151)
 + * Change order of directory searching for c*.in.sh (CASSANDRA-3983)
 +
  1.2.3
+  * Avoid allocating SSTableBoundedScanner during repair when the range does 
+    not intersect the sstable (CASSANDRA-5249)
  Merged from 1.1:
   * nodetool: ability to repair specific range (CASSANDRA-5280)
   * Fix possible assertion triggered in SliceFromReadCommand (CASSANDRA-5284)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5f9ac87/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5f9ac87/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------


Mime
View raw message