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/9a1d2cca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a1d2cca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a1d2cca Branch: refs/heads/cassandra-2.0 Commit: 9a1d2ccad7685bfc573d1d62ce312b7093315288 Parents: fc1fc93 c3c8a24 Author: Brandon Williams <[email protected]> Authored: Mon Nov 4 13:14:31 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Mon Nov 4 13:14:31 2013 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
