Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4eaca390 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4eaca390 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4eaca390 Branch: refs/heads/cassandra-2.0 Commit: 4eaca3907ff16d996762c696ab37f9519dce4e8f Parents: b1c60a0 d6d35ba Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Oct 14 16:36:13 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Oct 14 16:36:13 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4eaca390/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
