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/c8f596ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8f596ac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8f596ac Branch: refs/heads/trunk Commit: c8f596ac8dd2b2a1a700b9cdd9738361a7cad126 Parents: 025c07e 7065b1b Author: Brandon Williams <[email protected]> Authored: Thu Jun 12 18:48:24 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Thu Jun 12 18:48:24 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
