Merge branch 'cassandra-2.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/48ffe535 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48ffe535 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48ffe535 Branch: refs/heads/trunk Commit: 48ffe535b508fb05e80773352983c1169044bbd1 Parents: 9f7ab09 418deaf Author: T Jake Luciani <j...@apache.org> Authored: Wed May 13 11:43:18 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Wed May 13 11:43:18 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
