Updated Branches: refs/heads/trunk 038aa6bca -> 780ccc8ba
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/780ccc8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/780ccc8b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/780ccc8b Branch: refs/heads/trunk Commit: 780ccc8baef1ed9467d54d46e0c17eebcfeba003 Parents: 1c2922c 51e4b7a Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Oct 4 10:06:28 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Oct 4 10:06:28 2012 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------