Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3944775e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3944775e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3944775e Branch: refs/heads/cassandra-3.1 Commit: 3944775e7703a0497da03fd4f11d051dd8f2d24a Parents: 7a48a7d 0c04a6b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Nov 20 13:16:31 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Nov 20 13:16:31 2015 +0100 ---------------------------------------------------------------------- build.xml | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3944775e/build.xml ----------------------------------------------------------------------
