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/4625ba6c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4625ba6c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4625ba6c Branch: refs/heads/trunk Commit: 4625ba6c409414d7131598a6d769b95a8bbb34fc Parents: e023897 ea7bc14 Author: Vijay Parthasarathy <vijay2...@gmail.com> Authored: Tue Aug 20 15:54:12 2013 -0700 Committer: Vijay Parthasarathy <vijay2...@gmail.com> Committed: Tue Aug 20 15:54:12 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(-) ----------------------------------------------------------------------
