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/bab62d56 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bab62d56 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bab62d56 Branch: refs/heads/trunk Commit: bab62d560628e115b6ee86e9b24b7dccc3e288bc Parents: 108b4db 7af56b5 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Sep 24 10:46:56 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Sep 24 10:46:56 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bab62d56/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bab62d56/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
