natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Brandon Williams 2014-05-30 17:52:32 -05:00
parent 8262711189 e56a64edb0
commit ce248f227b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -9,10 +9,11 @@
2.1.0
* Upgrade to Pig 0.12.1 (CASSANDRA-6556)
Merged from 2.0:
* Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
Merged from 1.2:
* Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
* Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328)
2.1.0-rc1

2
build.xml
View File

@ -365,7 +365,7 @@
<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.11.1"/>
<dependency groupId="org.apache.pig" artifactId="pig" version="0.12.1"/>
<dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/>
<dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">