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/7263584c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7263584c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7263584c Branch: refs/heads/trunk Commit: 7263584c44f4af9044b875fa549abc08e6e6bc21 Parents: 25d2893 9d837e5 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri Jan 10 20:37:51 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri Jan 10 20:37:51 2014 -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/7263584c/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
