Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf142892 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf142892 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf142892 Branch: refs/heads/trunk Commit: bf1428922937033e16f792d453b7987d64bf3f73 Parents: c8a0a3a 14c6f70 Author: Brandon Williams <[email protected]> Authored: Fri Jan 17 10:07:34 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Jan 17 10:07:34 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
