merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e682ffc4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e682ffc4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e682ffc4 Branch: refs/heads/cassandra-2.1 Commit: e682ffc4700ddd57a1a961c8d7fbbb3a87d89ff9 Parents: 24d8571 ddda541 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Aug 7 09:27:14 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Aug 7 09:27:14 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
