Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe30c2c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe30c2c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe30c2c2 Branch: refs/heads/cassandra-2.1 Commit: fe30c2c23b7b12c3b3a9a4bb246362922193bf95 Parents: 87dc93e 368b63f Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Aug 6 14:28:17 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Aug 6 14:28:17 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------