Updated Branches: refs/heads/cassandra-1.1 ba637b4d1 -> 96afdba85 refs/heads/trunk 256e7c261 -> d6362da57
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6362da5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6362da5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6362da5 Branch: refs/heads/trunk Commit: d6362da57900e0973d42e1d3f965606fe7af67f2 Parents: 256e7c2 96afdba Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Feb 8 21:46:08 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Feb 8 21:46:08 2012 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/utils/FBUtilities.java | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
