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/15cd55fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15cd55fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15cd55fe Branch: refs/heads/cassandra-2.0 Commit: 15cd55fe17074bfb9099bd9c50d4fe6f8ce685e7 Parents: 4be6200 5977e7b Author: Brandon Williams <[email protected]> Authored: Fri Jan 10 12:49:22 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Jan 10 12:49:22 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
