Updated Branches: refs/heads/cassandra-1.0 641b021d3 -> f89b9aecc refs/heads/cassandra-1.1 a7ed01cc2 -> a1386f96c refs/heads/trunk 09ff86140 -> 92cf527f8
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/92cf527f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92cf527f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92cf527f Branch: refs/heads/trunk Commit: 92cf527f8ca1c02592bf2015916556ea8086dc20 Parents: 09ff861 a1386f9 Author: Jonathan Ellis <[email protected]> Authored: Tue May 22 10:49:52 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue May 22 10:49:52 2012 -0500 ---------------------------------------------------------------------- build.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92cf527f/build.xml ----------------------------------------------------------------------
