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/487e3de0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/487e3de0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/487e3de0 Branch: refs/heads/trunk Commit: 487e3de0559df55d99132814e9c06aa458a23748 Parents: 0da21de 9e29619 Author: Jonathan Ellis <[email protected]> Authored: Wed Aug 21 12:31:50 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Aug 21 12:31:50 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
