Merge branch 'cassandra-2.2' into trunk

This commit is contained in:
Dave Brosius 2015-05-22 18:48:37 -04:00
commit a2830ef993
1 changed files with 1 additions and 0 deletions

View File

@ -360,6 +360,7 @@
<dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3">
<exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
<exclusion groupId="commons-logging" artifactId="commons-logging"/>
<exclusion groupId="org.eclipse.jdt" artifactId="core"/>
</dependency>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"/>
<dependency groupId="org.apache.pig" artifactId="pig" version="0.12.1"/>