Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f5c8474 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f5c8474 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f5c8474 Branch: refs/heads/trunk Commit: 4f5c84742aae68bcd2b6e864c54a15ddba0bddf8 Parents: a44a3d4 50f49a6 Author: Dave Brosius <[email protected]> Authored: Tue Apr 30 00:55:10 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Tue Apr 30 00:55:10 2013 -0400 ---------------------------------------------------------------------- build.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f5c8474/build.xml ----------------------------------------------------------------------
