Updated Branches: refs/heads/cassandra-1.1 5177d56f3 -> 5796542aa refs/heads/trunk 9118804b5 -> 8a2afef95
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/8a2afef9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a2afef9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a2afef9 Branch: refs/heads/trunk Commit: 8a2afef95d0e121538f3475c59d5d059c3a2fa23 Parents: 9118804 5796542 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue May 29 17:37:05 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue May 29 17:37:05 2012 -0500 ---------------------------------------------------------------------- build.xml | 3 --- tools/bin/cassandra.in.sh | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a2afef9/build.xml ----------------------------------------------------------------------
