Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27747583 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27747583 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27747583 Branch: refs/heads/trunk Commit: 277475837f0906e6091b2e798afc4e7610846ed1 Parents: ba3a1ba 39925d2 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Jul 1 15:40:20 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Jul 1 15:40:20 2014 +0200 ---------------------------------------------------------------------- build.xml | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27747583/build.xml ----------------------------------------------------------------------
