Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1386f96 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1386f96 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1386f96 Branch: refs/heads/trunk Commit: a1386f96c23372685bbaa61c1bea5feca187f950 Parents: a7ed01c f89b9ae Author: Jonathan Ellis <[email protected]> Authored: Tue May 22 10:49:48 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue May 22 10:49:48 2012 -0500 ---------------------------------------------------------------------- build.xml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1386f96/build.xml ----------------------------------------------------------------------
