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/64c97327 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64c97327 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64c97327 Branch: refs/heads/trunk Commit: 64c97327c256679e17bdb208b475d3bc8aaa73ec Parents: 5ba0b96 4625ba6 Author: Vijay Parthasarathy <[email protected]> Authored: Tue Aug 20 15:54:46 2013 -0700 Committer: Vijay Parthasarathy <[email protected]> Committed: Tue Aug 20 15:54:46 2013 -0700 ---------------------------------------------------------------------- .../org/apache/cassandra/utils/obs/OffHeapBitSet.java | 11 +++++++++-- src/java/org/apache/cassandra/utils/obs/OpenBitSet.java | 6 +++--- 2 files changed, 12 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
