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/e14ce11c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e14ce11c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e14ce11c Branch: refs/heads/trunk Commit: e14ce11c02420b4a9330fcfe1aea1cbeb97f0fd2 Parents: 8ad6dc9 55a736a Author: Yuki Morishita <yu...@apache.org> Authored: Thu Jun 18 14:12:15 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Jun 18 14:12:15 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 237 ++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 148 insertions(+), 90 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e14ce11c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e14ce11c/build.xml ----------------------------------------------------------------------
