Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d31068d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d31068d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d31068d Branch: refs/heads/cassandra-2.2 Commit: 7d31068da952fb2990226057b52d17fb93f4eaa8 Parents: ebc50d7 4de943f Author: T Jake Luciani <j...@apache.org> Authored: Tue Jul 7 10:47:36 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Tue Jul 7 10:47:36 2015 -0400 ---------------------------------------------------------------------- build.xml | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d31068d/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 2300ca3,cf9788a..360accf --- a/build.xml +++ b/build.xml @@@ -360,8 -388,7 +360,9 @@@ </dependency> <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3"> <exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/> - <exclusion groupId="ant" artifactId="ant"/> + <exclusion groupId="commons-logging" artifactId="commons-logging"/> + <exclusion groupId="org.eclipse.jdt" artifactId="core"/> ++ <exclusion groupId="ant" artifactId="ant"/> </dependency> <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"/> <dependency groupId="org.apache.pig" artifactId="pig" version="0.12.1"/>