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/5ec10197 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ec10197 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ec10197 Branch: refs/heads/trunk Commit: 5ec10197f970ab5753a111947cf2a94b1ea287d9 Parents: 8bd1bf6 f36d1b5 Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Aug 21 10:38:01 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Aug 21 10:38:01 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/sstable/SSTableDeletingTask.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ec10197/CHANGES.txt ----------------------------------------------------------------------
