Merge branch 'cassandra-2.0' into trunk

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea72d69c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea72d69c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea72d69c

Branch: refs/heads/trunk
Commit: ea72d69c8b08983c4e4e62fa3eff10642cf6d010
Parents: 1141b82 1bad5ed
Author: Jonathan Ellis <jbel...@apache.org>
Authored: Wed Nov 20 07:26:30 2013 -0600
Committer: Jonathan Ellis <jbel...@apache.org>
Committed: Wed Nov 20 07:26:30 2013 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea72d69c/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------

Reply via email to