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/89f2c1de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89f2c1de Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89f2c1de Branch: refs/heads/trunk Commit: 89f2c1de63a75871367aee0f22985c8d2c4f9930 Parents: 1a77a69 31a1828 Author: T Jake Luciani <j...@apache.org> Authored: Mon Mar 16 11:49:39 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Mon Mar 16 11:49:39 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------