Merge branch 'cassandra-2.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/048f72bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/048f72bd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/048f72bd Branch: refs/heads/trunk Commit: 048f72bd3e22f69655ec28b03db95c3e48fc5296 Parents: 5aaa4a0 74e7f28 Author: Joshua McKenzie <[email protected]> Authored: Wed Aug 13 17:12:24 2014 -0500 Committer: Joshua McKenzie <[email protected]> Committed: Wed Aug 13 17:12:24 2014 -0500 ---------------------------------------------------------------------- build.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/048f72bd/build.xml ----------------------------------------------------------------------
