Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd91cf97 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd91cf97 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd91cf97 Branch: refs/heads/cassandra-2.0 Commit: cd91cf9746adf93788aa2cca76f8430e33216300 Parents: 39bdb2b 852e27f Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Jan 30 10:16:27 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Jan 30 10:16:27 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
