merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56141aee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56141aee Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56141aee Branch: refs/heads/cassandra-2.1 Commit: 56141aee857eb81109531b92029bd827e6976d76 Parents: f95b40c 46193d7 Author: Jonathan Ellis <[email protected]> Authored: Thu Aug 7 09:27:54 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Aug 7 09:27:54 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
