Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af8a477c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af8a477c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af8a477c Branch: refs/heads/trunk Commit: af8a477ccc9d771f1d8e05298bc92d3d98062bd4 Parents: 9852a93 bf1ed40 Author: Brandon Williams <[email protected]> Authored: Fri Jan 4 12:14:18 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Jan 4 12:14:18 2013 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
