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/15d60756 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15d60756 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15d60756 Branch: refs/heads/trunk Commit: 15d607568ccf932e28b51544c1ee59cbff32c8eb Parents: d4461f8 de6a74a Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Feb 12 15:50:38 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Feb 12 15:50:38 2014 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/service/CassandraDaemon.java | 2 +- src/java/org/apache/cassandra/utils/FBUtilities.java | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15d60756/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15d60756/src/java/org/apache/cassandra/utils/FBUtilities.java ----------------------------------------------------------------------
