Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7068fd7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7068fd7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7068fd7 Branch: refs/heads/cassandra-3.1 Commit: d7068fd72e4597112dc91011da87d58bdb9c0c3b Parents: a9a2d75 e491f05 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Wed Dec 2 15:32:40 2015 -0600 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Wed Dec 2 15:32:40 2015 -0600 ---------------------------------------------------------------------- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7068fd7/build.xml ----------------------------------------------------------------------