Merge branch 'cassandra-2.1' into trunk

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/4fd3349e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4fd3349e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4fd3349e

Branch: refs/heads/trunk
Commit: 4fd3349e2e63005b2d5422b7ef9c1637da0cb9bb
Parents: 70f1ac6 4f863be
Author: Jake Luciani <j...@apache.org>
Authored: Wed Nov 5 15:44:03 2014 -0500
Committer: Jake Luciani <j...@apache.org>
Committed: Wed Nov 5 15:44:03 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 bin/cassandra.bat                               |   2 +-
 bin/cassandra.in.sh                             |   2 +-
 build.xml                                       |  14 +-
 conf/cassandra-env.ps1                          |   2 +-
 conf/cassandra-env.sh                           |   2 +-
 debian/cassandra.in.sh                          |   2 +-
 lib/jamm-0.2.6.jar                              | Bin 13290 -> 0 bytes
 lib/jamm-0.2.8.jar                              | Bin 0 -> 13684 bytes
 lib/licenses/jamm-0.2.6.txt                     | 202 -------------------
 lib/licenses/jamm-0.2.8.txt                     | 202 +++++++++++++++++++
 .../apache/cassandra/cql3/QueryProcessor.java   |   2 +-
 .../org/apache/cassandra/utils/ObjectSizes.java |   3 +-
 13 files changed, 218 insertions(+), 216 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd3349e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ee05da9,2b9e10c..736c659
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,5 +1,38 @@@
 +3.0
 + * Mark sstables as repaired after full repair (CASSANDRA-7586) 
 + * Extend Descriptor to include a format value and refactor reader/writer 
apis (CASSANDRA-7443)
 + * Integrate JMH for microbenchmarks (CASSANDRA-8151)
 + * Keep sstable levels when bootstrapping (CASSANDRA-7460)
 + * Add Sigar library and perform basic OS settings check on startup 
(CASSANDRA-7838)
 + * Support for aggregation functions (CASSANDRA-4914)
 + * Remove cassandra-cli (CASSANDRA-7920)
 + * Accept dollar quoted strings in CQL (CASSANDRA-7769)
 + * Make assassinate a first class command (CASSANDRA-7935)
 + * Support IN clause on any clustering column (CASSANDRA-4762)
 + * Improve compaction logging (CASSANDRA-7818)
 + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 
7781, 7929,
 +   7924, 7812, 8063)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 + * Fail on very large batch sizes (CASSANDRA-8011)
 + * improve concurrency of repair (CASSANDRA-6455)
 +
 +
  2.1.2
+  * Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209)
   * Optimize partitioner tokens (CASSANDRA-8230)
   * Improve compaction of repaired/unrepaired sstables (CASSANDRA-8004)
   * Make cache serializers pluggable (CASSANDRA-8096)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd3349e/bin/cassandra.bat
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd3349e/bin/cassandra.in.sh
----------------------------------------------------------------------
diff --cc bin/cassandra.in.sh
index ed124bc,5b4ee0f..b4ed9b6
--- a/bin/cassandra.in.sh
+++ b/bin/cassandra.in.sh
@@@ -48,8 -48,5 +48,8 @@@ don
  if [ "$JVM_VENDOR" != "OpenJDK" -o "$JVM_VERSION" \> "1.6.0" ] \
        || [ "$JVM_VERSION" = "1.6.0" -a "$JVM_PATCH_VERSION" -ge 23 ]
  then
-     JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.6.jar"
+     JAVA_AGENT="$JAVA_AGENT -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.8.jar"
  fi
 +
 +# Added sigar-bin to the java.library.path CASSANDRA-7838
 +JAVA_OPTS="$JAVA_OPTS:-Djava.library.path=$CASSANDRA_HOME/lib/sigar-bin"

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd3349e/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index d119e83,e2785c1..2642034
--- a/build.xml
+++ b/build.xml
@@@ -331,11 -364,14 +331,11 @@@
            <dependency groupId="ch.qos.logback" artifactId="logback-classic" 
version="1.1.2"/>
            <dependency groupId="org.codehaus.jackson" 
artifactId="jackson-core-asl" version="1.9.2"/>
            <dependency groupId="org.codehaus.jackson" 
artifactId="jackson-mapper-asl" version="1.9.2"/>
 -          <dependency groupId="jline" artifactId="jline" version="1.0">
 -            <exclusion groupId="junit" artifactId="junit"/>
 -          </dependency>
            <dependency groupId="com.googlecode.json-simple" 
artifactId="json-simple" version="1.1"/>
            <dependency groupId="com.boundary" artifactId="high-scale-lib" 
version="1.0.6"/>
-           <dependency groupId="com.github.jbellis" artifactId="jamm" 
version="0.2.6"/>
-           <dependency groupId="com.thinkaurelius.thrift" 
artifactId="thrift-server" version="0.3.5">
-               <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
+           <dependency groupId="com.github.jbellis" artifactId="jamm" 
version="0.2.8"/>
+           <dependency groupId="com.thinkaurelius.thrift" 
artifactId="thrift-server" version="0.3.7">
 -              <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
++              <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
            </dependency>
            <dependency groupId="org.yaml" artifactId="snakeyaml" 
version="1.11"/>
            <dependency groupId="org.apache.thrift" artifactId="libthrift" 
version="0.9.1"/>
@@@ -1106,7 -1107,7 +1106,7 @@@
          <formatter type="brief" usefile="false"/>
          <jvmarg value="-Dstorage-config=${test.conf}"/>
          <jvmarg value="-Djava.awt.headless=true"/>
-         <jvmarg line="-javaagent:${basedir}/lib/jamm-0.2.6.jar 
${additionalagent}" />
 -        <jvmarg value="-javaagent:${basedir}/lib/jamm-0.2.8.jar" />
++        <jvmarg value="-javaagent:${basedir}/lib/jamm-0.2.8.jar 
${additionalagent}" />
          <jvmarg value="-ea"/>
          <jvmarg value="-Xss256k"/>
          <jvmarg 
value="-Dcassandra.memtable_row_overhead_computation_step=100"/>

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd3349e/conf/cassandra-env.ps1
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd3349e/conf/cassandra-env.sh
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd3349e/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------

Reply via email to