Updated Branches: refs/heads/cassandra-1.2 a548f05de -> fac299f8a refs/heads/trunk 83c014777 -> c83110609
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c8311060 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8311060 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8311060 Branch: refs/heads/trunk Commit: c83110609b44f2bed07a96f9c5848f40d0816de1 Parents: 4f3a869 fac299f Author: Brandon Williams <[email protected]> Authored: Tue Jan 15 16:42:59 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Jan 15 16:42:59 2013 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
