Merge branch 'cassandra-2.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/729da03c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/729da03c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/729da03c Branch: refs/heads/trunk Commit: 729da03c53213cb23cc4c026c5e20b9328e68f1a Parents: 89338a1 c49d336 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri Mar 14 00:46:32 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri Mar 14 00:46:32 2014 -0400 ---------------------------------------------------------------------- build.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/729da03c/build.xml ----------------------------------------------------------------------
