Merge branch 'cassandra-2.1.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/25c335f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25c335f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25c335f7 Branch: refs/heads/trunk Commit: 25c335f7372d9d9527552ae7c9f4f421d0fafc8b Parents: 54c6e66 bb55843 Author: Jake Luciani <j...@apache.org> Authored: Tue Aug 12 10:27:17 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Tue Aug 12 10:27:17 2014 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
