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/fc9709cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc9709cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc9709cd Branch: refs/heads/trunk Commit: fc9709cdfe6076bf7b6653a1797299c197be8619 Parents: 604e31b 2f63bba Author: Brandon Williams <[email protected]> Authored: Mon Dec 30 09:52:31 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Mon Dec 30 09:52:31 2013 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
