Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8490cce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8490cce Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8490cce Branch: refs/heads/trunk Commit: d8490ccea1e38c1a4246a025fc01b76191387a0f Parents: c0be341 e786101 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu May 1 18:00:31 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu May 1 18:00:31 2014 +0200 ---------------------------------------------------------------------- .rat-excludes | 1 + CHANGES.txt | 1 + NEWS.txt | 5 ++ build.xml | 2 +- conf/logback-tools.xml | 19 +++++ conf/logback.xml | 19 +++++ debian/changelog | 6 ++ debian/rules | 2 +- .../org/apache/cassandra/dht/BootStrapper.java | 2 +- .../org/apache/cassandra/dht/RangeStreamer.java | 81 +++++++++++++++++++- .../io/util/ChecksummedSequentialWriter.java | 17 ++++ .../cassandra/service/StorageService.java | 44 ++++++++++- test/conf/logback-test.xml | 19 +++++ .../stress/settings/OptionCompaction.java | 17 ++++ 14 files changed, 227 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8490cce/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8490cce/NEWS.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8490cce/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8490cce/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
