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/6d1500c5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d1500c5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d1500c5 Branch: refs/heads/trunk Commit: 6d1500c5012d570a23ca754df1acd0f56aab1d5b Parents: 3ac2614 0c96f99 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed May 28 06:45:39 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed May 28 06:45:39 2014 -0400 ---------------------------------------------------------------------- build.xml | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d1500c5/build.xml ----------------------------------------------------------------------
