Merge branch 'cassandra-2.0' into trunk
Conflicts:
build.xml
test/conf/log4j-junit.properties
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f130310
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f130310
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f130310
Branch: refs/heads/trunk
Commit: 0f13031023ea588b8b71f3aab3108797c3a114d6
Parents: bb13b80 fe598e7
Author: Brandon Williams <[email protected]>
Authored: Mon Oct 14 14:19:20 2013 -0500
Committer: Brandon Williams <[email protected]>
Committed: Mon Oct 14 14:19:20 2013 -0500
----------------------------------------------------------------------
build.xml | 8 +
.../hadoop/pig/AbstractCassandraStorage.java | 4 +-
.../cassandra/hadoop/pig/CassandraStorage.java | 25 +-
.../apache/cassandra/hadoop/pig/CqlStorage.java | 25 +-
test/conf/log4j-junit.properties | 40 +
.../org/apache/cassandra/pig/CqlTableTest.java | 236 ++++++
.../org/apache/cassandra/pig/PigTestBase.java | 167 ++++
.../cassandra/pig/ThriftColumnFamilyTest.java | 809 +++++++++++++++++++
test/unit/org/apache/pig/test/MiniCluster.java | 78 ++
.../org/apache/pig/test/MiniGenericCluster.java | 122 +++
10 files changed, 1507 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f130310/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 6e22525,5e7f269..fe1a5f7
--- a/build.xml
+++ b/build.xml
@@@ -363,13 -360,12 +363,14 @@@
<dependency groupId="junit" artifactId="junit" version="4.6" />
<dependency groupId="commons-logging" artifactId="commons-logging"
version="1.1.1"/>
- <dependency groupId="org.apache.rat" artifactId="apache-rat"
version="0.6">
+ <dependency groupId="org.apache.rat" artifactId="apache-rat"
version="0.10">
<exclusion groupId="commons-lang" artifactId="commons-lang"/>
</dependency>
- <dependency groupId="org.apache.hadoop" artifactId="hadoop-core"
version="1.0.3"/>
+ <dependency groupId="org.apache.hadoop" artifactId="hadoop-core"
version="1.0.3">
+ <exclusion groupId="org.mortbay.jetty"
artifactId="servlet-api"/>
+ </dependency>
+ <dependency groupId="org.apache.hadoop"
artifactId="hadoop-minicluster" version="1.0.3"/>
- <dependency groupId="org.apache.pig" artifactId="pig"
version="0.10.0"/>
+ <dependency groupId="org.apache.pig" artifactId="pig"
version="0.11.1"/>
<dependency groupId="net.java.dev.jna" artifactId="jna"
version="3.2.7"/>
<dependency groupId="net.sourceforge.cobertura"
artifactId="cobertura" version="${cobertura.version}"/>
