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/1ede2967 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ede2967 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ede2967 Branch: refs/heads/trunk Commit: 1ede2967b89f7831df8023f71174b262d878a0fe Parents: 0d0acac cafaa8e Author: Jonathan Ellis <[email protected]> Authored: Wed Feb 12 15:36:15 2014 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Wed Feb 12 15:36:15 2014 -0600 ---------------------------------------------------------------------- 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/1ede2967/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
