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