Merge branch 'cassandra-2.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/a6686386 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6686386 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6686386 Branch: refs/heads/trunk Commit: a66863861136a29dc04d7bc3b319f9f8fae0f49f Parents: 074452e a65953d Author: Robert Stupp <[email protected]> Authored: Mon Jul 20 15:17:22 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Mon Jul 20 15:17:22 2015 +0200 ---------------------------------------------------------------------- build.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6686386/build.xml ----------------------------------------------------------------------
