Updated Branches: refs/heads/cassandra-1.1 a21307a27 -> 6dddf360e refs/heads/trunk 4d88a1dac -> c34c70f0b
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/c34c70f0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c34c70f0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c34c70f0 Branch: refs/heads/trunk Commit: c34c70f0bbc6c87c0c713763fccb5b7cb19f16bf Parents: 4d88a1d 6dddf36 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sat Jun 16 10:15:54 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sat Jun 16 10:15:54 2012 -0500 ---------------------------------------------------------------------- build.xml | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c34c70f0/build.xml ----------------------------------------------------------------------
