Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7dd320c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7dd320c9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7dd320c9 Branch: refs/heads/cassandra-2.1 Commit: 7dd320c9e764a980099e8fe247a4dcb3ada4a925 Parents: f64a113 7e71d01 Author: Brandon Williams <[email protected]> Authored: Tue Aug 5 14:02:21 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Aug 5 14:02:21 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
