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/590d4037 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/590d4037 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/590d4037 Branch: refs/heads/trunk Commit: 590d40375e7dc33308458f464f76d689b825b195 Parents: 7bceedf c1b5c27 Author: Brandon Williams <[email protected]> Authored: Wed Jun 18 14:17:56 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Jun 18 14:17:56 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
