Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea7bc142 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea7bc142 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea7bc142 Branch: refs/heads/trunk Commit: ea7bc14225387c3a9a985d06a8aba652315a86f1 Parents: 33fda2d fcc51ea Author: Vijay Parthasarathy <vijay2...@gmail.com> Authored: Tue Aug 20 15:53:23 2013 -0700 Committer: Vijay Parthasarathy <vijay2...@gmail.com> Committed: Tue Aug 20 15:53:23 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea7bc142/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea7bc142/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java ----------------------------------------------------------------------
