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/e246ec25 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e246ec25 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e246ec25 Branch: refs/heads/trunk Commit: e246ec258ccab5cbd648eeb5e04feb5f952c5370 Parents: e14ce11 947edf1 Author: Yuki Morishita <[email protected]> Authored: Thu Jun 18 19:26:43 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Thu Jun 18 19:26:43 2015 -0500 ---------------------------------------------------------------------- build.xml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e246ec25/build.xml ----------------------------------------------------------------------
