Merge branch 'cassandra-3.0' into trunk
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea0a9726
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea0a9726
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea0a9726
Branch: refs/heads/trunk
Commit: ea0a972639510c54f35e1ec40023ef19f9c088f7
Parents: cc90d04 fd24b7c
Author: Tyler Hobbs <[email protected]>
Authored: Wed Apr 13 12:53:22 2016 -0500
Committer: Tyler Hobbs <[email protected]>
Committed: Wed Apr 13 12:53:22 2016 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
