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/754643c5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/754643c5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/754643c5 Branch: refs/heads/trunk Commit: 754643c5e4368d34102d0cd30def6571f1eddc2f Parents: 8f5c903 aa3c10d Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue May 6 01:37:15 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue May 6 01:37:15 2014 -0400 ---------------------------------------------------------------------- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/754643c5/build.xml ----------------------------------------------------------------------
