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/c5bc8114 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5bc8114 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5bc8114 Branch: refs/heads/trunk Commit: c5bc811486e90f2b244801fd1f5e4ecc2de36108 Parents: 68722e7 f5f5912 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu May 14 17:50:56 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu May 14 17:50:56 2015 +0300 ---------------------------------------------------------------------- .../apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
