Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5f4cdd2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5f4cdd2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5f4cdd2 Branch: refs/heads/trunk Commit: c5f4cdd2be439dc3057bddcc6cbdd7ded0938ae3 Parents: d5c0c7a 8bb5487 Author: Dave Brosius <dbros...@apache.org> Authored: Sun Apr 21 22:55:04 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Sun Apr 21 22:55:04 2013 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/utils/SlabAllocator.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5f4cdd2/src/java/org/apache/cassandra/utils/SlabAllocator.java ----------------------------------------------------------------------
