Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eab15846 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eab15846 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eab15846 Branch: refs/heads/cassandra-2.1 Commit: eab158462441ba414792acc228051250be34ab24 Parents: de5bb58 561f6ef Author: Jake Luciani <j...@apache.org> Authored: Fri Aug 15 15:15:38 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Fri Aug 15 15:15:38 2014 -0400 ---------------------------------------------------------------------- .../apache/cassandra/io/util/BufferedRandomAccessFileTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
