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/5f186581 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f186581 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f186581 Branch: refs/heads/trunk Commit: 5f18658170b66714e46f82b8151c5fcab233d742 Parents: ad60b78 6b8b8e0 Author: Brandon Williams <[email protected]> Authored: Mon Sep 29 09:46:47 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Sep 29 09:46:47 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
