Updated Branches: refs/heads/trunk 64f3ab270 -> 213d25c99
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/213d25c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/213d25c9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/213d25c9 Branch: refs/heads/trunk Commit: 213d25c99c5a197a28be6b41ecf26fe48ae4eece Parents: 3d48671 afd95c1 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Oct 26 08:48:14 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Oct 26 08:48:14 2012 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
