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/4c3ba4f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c3ba4f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c3ba4f3 Branch: refs/heads/trunk Commit: 4c3ba4f30acf65d769517009f8d263f6d87ede81 Parents: 32358d6 2c701f8 Author: Jake Luciani <j...@apache.org> Authored: Thu Aug 7 14:53:30 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Thu Aug 7 14:53:30 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/CassandraDaemon.java | 9 + .../apache/cassandra/cql3/CorruptionTest.java | 195 +++++++++++++++++++ 3 files changed, 205 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c3ba4f3/CHANGES.txt ----------------------------------------------------------------------
