Updated Branches: refs/heads/trunk 682a34f36 -> 749522b7f
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/749522b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/749522b7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/749522b7 Branch: refs/heads/trunk Commit: 749522b7f96cb8f18ce4ce9aef69a7ad8037c309 Parents: 682a34f 5cbdf13 Author: Vijay Parthasarathy <[email protected]> Authored: Tue Jun 12 11:41:05 2012 -0700 Committer: Vijay Parthasarathy <[email protected]> Committed: Tue Jun 12 11:41:05 2012 -0700 ---------------------------------------------------------------------- build.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/749522b7/build.xml ----------------------------------------------------------------------
