Updated Branches: refs/heads/cassandra-1.1 d34865bc9 -> 057ea8620 refs/heads/trunk a14f08b5f -> b4d6d5159
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/b4d6d515 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4d6d515 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4d6d515 Branch: refs/heads/trunk Commit: b4d6d5159d90f2e9729fd1eb65b3a52f97fd69df Parents: a14f08b 057ea86 Author: Jonathan Ellis <[email protected]> Authored: Wed Apr 18 11:39:20 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Apr 18 11:39:20 2012 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
