Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcd80487 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcd80487 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcd80487 Branch: refs/heads/trunk Commit: bcd80487a4c4af3b5e76a6720b5032ae2d622a22 Parents: e2506f1 2ef11b4 Author: Dave Brosius <dbros...@apache.org> Authored: Thu May 2 10:24:19 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Thu May 2 10:24:19 2013 -0400 ---------------------------------------------------------------------- build.xml | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcd80487/build.xml ----------------------------------------------------------------------