Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5ac7647 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5ac7647 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5ac7647 Branch: refs/heads/trunk Commit: e5ac7647dd7b482a2ee3c62657e1d33b60dccf8f Parents: 097df17 c06c276 Author: Dave Brosius <[email protected]> Authored: Sun Oct 14 14:21:47 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Sun Oct 14 14:21:47 2012 -0400 ---------------------------------------------------------------------- build.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
