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/d4461f83 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4461f83 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4461f83 Branch: refs/heads/trunk Commit: d4461f832e9d3a343dce76a9da8b35f538f493e4 Parents: f78db53 c6c686f Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Feb 12 15:48:25 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Feb 12 15:48:25 2014 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/service/CassandraDaemon.java | 5 +++-- src/java/org/apache/cassandra/utils/FBUtilities.java | 12 ++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4461f83/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4461f83/src/java/org/apache/cassandra/utils/FBUtilities.java ----------------------------------------------------------------------
