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/8174dabf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8174dabf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8174dabf Branch: refs/heads/trunk Commit: 8174dabf33e9e6cbdf2424692a9ee22df10f77f8 Parents: fbb6b8a 2e37655 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Oct 30 11:09:44 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Oct 30 11:09:44 2014 -0500 ---------------------------------------------------------------------- .../unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8174dabf/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java ----------------------------------------------------------------------
