Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e296196 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e296196 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e296196 Branch: refs/heads/trunk Commit: 9e2961964e8b6129ff03fd066951fcad3be12742 Parents: b362aeb 9dc4c16 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Aug 21 12:31:42 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Aug 21 12:31:42 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
