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/2341e945 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2341e945 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2341e945 Branch: refs/heads/trunk Commit: 2341e945b950afd631faaad9189e61191d2cc2fe Parents: 7d68ced e4072cf Author: Marcus Eriksson <[email protected]> Authored: Fri Apr 3 20:58:37 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Fri Apr 3 20:58:37 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/tools/SSTableOfflineRelevel.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2341e945/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2341e945/src/java/org/apache/cassandra/tools/SSTableOfflineRelevel.java ----------------------------------------------------------------------
