Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/077f9bf5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/077f9bf5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/077f9bf5 Branch: refs/heads/cassandra-3.0 Commit: 077f9bf5f55fe7dca0b10b3357314c208c2f35ed Parents: ae64cc0 5a665b8 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Nov 18 12:52:36 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Nov 18 12:52:36 2015 +0000 ---------------------------------------------------------------------- .../org/apache/cassandra/io/sstable/CorruptSSTableException.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
