Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf4c5b0c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf4c5b0c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf4c5b0c Branch: refs/heads/trunk Commit: cf4c5b0c26187dffa7de27fda7b7f277b388cb5b Parents: 5e51aa4 43d35a6 Author: Brandon Williams <[email protected]> Authored: Wed Apr 2 17:53:28 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Apr 2 17:53:28 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
