cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 18 Feb 2016 20:43:28 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b5df24f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b5df24f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b5df24f

Branch: refs/heads/trunk
Commit: 9b5df24f5a84c37be2a587322aae81ff07881195
Parents: 4354fb2 71f4406
Author: Robert Stupp <snazy@snazy.de>
Authored: Thu Feb 18 21:40:10 2016 +0100
Committer: Robert Stupp <snazy@snazy.de>
Committed: Thu Feb 18 21:40:10 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt |  1 +
 build.xml   | 15 +++++----------
 2 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5df24f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1e69cd0,10f23af..ae9cd75
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,5 +1,19 @@@
 -2.2.6
 +3.0.4
 + * Disallow drop/alter operations of UDTs used by UDAs (CASSANDRA-10721)
 + * Add query time validation method on Index (CASSANDRA-11043)
 + * Avoid potential AssertionError in mixed version cluster (CASSANDRA-11128)
 + * Properly handle hinted handoff after topology changes (CASSANDRA-5902)
 + * AssertionError when listing sstable files on inconsistent disk state (CASSANDRA-11156)
 + * Fix wrong rack counting and invalid conditions check for TokenAllocation
 +   (CASSANDRA-11139)
 + * Avoid creating empty hint files (CASSANDRA-11090)
 + * Fix leak detection strong reference loop using weak reference (CASSANDRA-11120)
 + * Configurie BatchlogManager to stop delayed tasks on shutdown (CASSANDRA-11062)
 + * Hadoop integration is incompatible with Cassandra Driver 3.0.0 (CASSANDRA-11001)
 + * Add dropped_columns to the list of schema table so it gets handled
 +   properly (CASSANDRA-11050)
 +Merged from 2.2:
+  * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
   * Protect from keyspace dropped during repair (CASSANDRA-11065)
   * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
   * Better error message for cleanup (CASSANDRA-10991)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b5df24f/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index f9ff00d,361a057..d27b77a
--- a/build.xml
+++ b/build.xml
@@@ -394,13 -402,13 +394,11 @@@
            <dependency groupId="io.netty" artifactId="netty-all" version="4.0.23.Final"
/>
            <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2"
/>
            <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2"
/>
--          <!-- TODO CASSANDRA-9543
--          <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
version="2.1.5" classifier="shaded" />
--          -->
++          <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
version="3.0.0" classifier="shaded" />
            <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj" version="4.4.2"
/>
 -          <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.3.4"
/>
 -          <dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0"
/>
 -	      <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations"
version="1.2.0" />
 +          <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.4.2"
/>
 +          <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="0.4.2"
/>
 +          <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations"
version="1.2.0" />
            <dependency groupId="org.fusesource" artifactId="sigar" version="1.6.4">
            	<exclusion groupId="log4j" artifactId="log4j"/>
            </dependency>
@@@ -447,14 -454,14 +445,12 @@@
          <dependency groupId="org.apache.rat" artifactId="apache-rat"/>
          <dependency groupId="org.apache.hadoop" artifactId="hadoop-core"/>
        	<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster"/>
 -        <dependency groupId="org.apache.pig" artifactId="pig"/>
        	<dependency groupId="com.google.code.findbugs" artifactId="jsr305"/>
          <dependency groupId="org.antlr" artifactId="antlr"/>
--        <!-- TODO CASSANDRA-9543
          <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
classifier="shaded"/>
--        -->
          <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
 -        <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/>
 +        <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.4.2"
/>
 +        <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="0.4.2"
/>
          <dependency groupId="org.openjdk.jmh" artifactId="jmh-core"/>
          <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess"/>
          <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations"/>
@@@ -468,9 -475,18 +464,7 @@@
                  artifactId="cassandra-parent"
                  version="${version}"/>
          <dependency groupId="junit" artifactId="junit"/>
 -        <dependency groupId="org.apache.pig" artifactId="pig">
 -          <exclusion groupId="xmlenc" artifactId="xmlenc"/>
 -          <exclusion groupId="tomcat" artifactId="jasper-runtime"/>
 -          <exclusion groupId="tomcat" artifactId="jasper-compiler"/>
 -          <exclusion groupId="org.eclipse.jdt" artifactId="core"/>
 -          <exclusion groupId="net.sf.kosmosfs" artifactId="kfs"/>
 -          <exclusion groupId="hsqldb" artifactId="hsqldb"/>
 -          <exclusion groupId="antlr" artifactId="antlr"/>
 -        </dependency>
--        <!-- TODO CASSANDRA-9543
          <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
classifier="shaded"/>
--        -->
          <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
          <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/>
          <dependency groupId="org.openjdk.jmh" artifactId="jmh-core"/>
@@@ -540,20 -559,25 +534,21 @@@
          <!-- don't need hadoop classes to run, but if you use the hadoop stuff -->
          <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" optional="true"/>
          <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" optional="true"/>
 -        <dependency groupId="org.apache.pig" artifactId="pig" optional="true"/>
--        <!-- TODO CASSANDRA-9543
++
++        <!-- don't need the Java Driver to run, but if you use the hadoop stuff or UDFs
-->
          <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
classifier="shaded" optional="true"/>
--        -->
  
          <!-- don't need jna to run, but nice to have -->
          <dependency groupId="net.java.dev.jna" artifactId="jna"/>
 -        
 +
          <!-- don't need jamm unless running a server in which case it needs to be a -javagent
to be used anyway -->
          <dependency groupId="com.github.jbellis" artifactId="jamm"/>
 -		<dependency groupId="com.github.tjake" artifactId="crc32ex"/>
 -        <dependency groupId="io.netty" artifactId="netty-all"/>
 -      	
 -      	<dependency groupId="joda-time" artifactId="joda-time"/>
  
 +        <dependency groupId="io.netty" artifactId="netty-all"/>
 +        <dependency groupId="joda-time" artifactId="joda-time"/>
          <dependency groupId="org.fusesource" artifactId="sigar"/>
-         <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj" />
 -
+         <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
+         <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/>
        </artifact:pom>
        <artifact:pom id="thrift-pom"
                      artifactId="cassandra-thrift"


Mime
View raw message