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/14c6f703 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14c6f703 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14c6f703 Branch: refs/heads/cassandra-2.0 Commit: 14c6f70301d30f81369b614b6e43e8da2ddf2f80 Parents: 90f661e a3f7035 Author: Brandon Williams <[email protected]> Authored: Fri Jan 17 10:07:24 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Jan 17 10:07:24 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
