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/5b7798cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b7798cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b7798cd Branch: refs/heads/trunk Commit: 5b7798cd5e98450ed0baae6284cbf22e66f00fc6 Parents: 36640fc 2774758 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Jul 1 15:41:26 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Jul 1 15:41:26 2014 +0200 ---------------------------------------------------------------------- build.xml | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b7798cd/build.xml ----------------------------------------------------------------------
