Updated Branches: refs/heads/trunk 927356e0c -> 27fb2bffb
Merge branch 'cassandra-1.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/27fb2bff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27fb2bff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27fb2bff Branch: refs/heads/trunk Commit: 27fb2bffb835d3f7c3027146664f3ed730efc1e5 Parents: 927356e 49e134c Author: Peter Schuller <peter.schul...@infidyne.com> Authored: Wed Feb 29 02:10:16 2012 -0800 Committer: Peter Schuller <peter.schul...@infidyne.com> Committed: Wed Feb 29 02:10:16 2012 -0800 ---------------------------------------------------------------------- .../cassandra/io/util/RandomAccessReader.java | 4 ++-- .../apache/cassandra/io/util/SequentialWriter.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27fb2bff/src/java/org/apache/cassandra/io/util/RandomAccessReader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27fb2bff/src/java/org/apache/cassandra/io/util/SequentialWriter.java ----------------------------------------------------------------------