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/63059a81 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63059a81 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63059a81 Branch: refs/heads/cassandra-2.0 Commit: 63059a81944094e4946fdc337ff8951dd2c6ca3e Parents: 55211bc 35c78d6 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Jan 29 08:56:25 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Jan 29 08:56:25 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------