Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/06893e4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06893e4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06893e4f Branch: refs/heads/trunk Commit: 06893e4ff4fe81161010e0e948af20b0bb587c4c Parents: 567146e d391726 Author: Brandon Williams <[email protected]> Authored: Fri Sep 7 11:05:35 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Sep 7 11:05:35 2012 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
