Merge branch 'cassandra-2.1' into trunk
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6a4b454
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6a4b454
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6a4b454
Branch: refs/heads/trunk
Commit: d6a4b4548f780b1f27177beda76a2c7a2b341412
Parents: dcde8ca cba1b68
Author: Brandon Williams <[email protected]>
Authored: Tue Apr 14 12:46:04 2015 -0500
Committer: Brandon Williams <[email protected]>
Committed: Tue Apr 14 12:46:04 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
