Updated Branches: refs/heads/cassandra-1.0 6ba063387 -> f4430ff4e refs/heads/cassandra-1.1 0529feb79 -> 52bd2732c refs/heads/trunk 13f695365 -> 86a775d1e
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/86a775d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86a775d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86a775d1 Branch: refs/heads/trunk Commit: 86a775d1ebea026102fc9a5731a6b9d397fd6a30 Parents: 13f6953 52bd273 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue May 1 13:59:18 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue May 1 13:59:18 2012 -0500 ---------------------------------------------------------------------- build.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/86a775d1/build.xml ----------------------------------------------------------------------
