Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c946cbf1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c946cbf1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c946cbf1 Branch: refs/heads/trunk Commit: c946cbf18c7eac60062acc75d8d4c5c412ffdd8a Parents: 9eb01ae 0851fd7 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Mar 4 17:10:48 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Mar 4 17:10:48 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++ src/java/org/apache/cassandra/tools/StandaloneScrubber.java | 3 +-- 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c946cbf1/CHANGES.txt ----------------------------------------------------------------------
