Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/service/CassandraDaemon.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c408af2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c408af2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c408af2
Branch: refs/heads/trunk
Commit: 5c408af2e5075b8100eb67b7549bdb1cdb57412c
Parents: ccbf921 4eaca39
Author: Brandon Williams <[email protected]>
Authored: Mon Oct 14 16:37:16 2013 -0500
Committer: Brandon Williams <[email protected]>
Committed: Mon Oct 14 16:37:16 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
