Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f1b7496 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f1b7496 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f1b7496 Branch: refs/heads/trunk Commit: 6f1b74963b6297881a83d1cbbfa81efde465f7f0 Parents: fee7137 f13ce55 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Oct 29 14:01:45 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Oct 29 14:01:45 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------