Merge branch 'cassandra-2.1' into trunk
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59123b6f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59123b6f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59123b6f
Branch: refs/heads/trunk
Commit: 59123b6f7d8d8d84a61716f9f2bb4a18c620a764
Parents: 00d7e4c 6beb13f
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Thu Aug 7 00:51:07 2014 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Thu Aug 7 00:51:07 2014 +0300
----------------------------------------------------------------------
build.xml | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/59123b6f/build.xml
----------------------------------------------------------------------
