merge from 2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0df28d14 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0df28d14 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0df28d14 Branch: refs/heads/trunk Commit: 0df28d14a47de93a87b9546b21b04b32e93ef68c Parents: cb5897f f1115cf Author: Jonathan Ellis <[email protected]> Authored: Tue Apr 14 14:31:27 2015 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Apr 14 14:31:27 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0df28d14/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0df28d14/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
