cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [06/10] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0
Date Wed, 31 May 2017 13:02:01 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/a2f742cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2f742cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2f742cd

Branch: refs/heads/cassandra-3.0
Commit: a2f742cd633ddd650b65f841c50ee96ee1da0ef5
Parents: 8ffdd26 3c81aa8
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Wed May 31 14:42:17 2017 +0200
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Wed May 31 14:42:17 2017 +0200

----------------------------------------------------------------------
 CHANGES.txt                |   2 +
 build.xml                  |   2 +-
 lib/jna-4.0.0.jar          | Bin 914639 -> 0 bytes
 lib/jna-4.4.0.jar          | Bin 0 -> 1091208 bytes
 lib/licenses/jna-4.0.0.txt | 202 ----------------------------------------
 lib/licenses/jna-4.4.0.txt | 202 ++++++++++++++++++++++++++++++++++++++++
 6 files changed, 205 insertions(+), 203 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2f742cd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 18dca09,4f3fba8..164470f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,43 -1,9 +1,45 @@@
 -2.2.10
 +3.0.14
 + * Interned ColumnIdentifiers should use minimal ByteBuffers (CASSANDRA-13533)
 + * ReverseIndexedReader may drop rows during 2.1 to 3.0 upgrade (CASSANDRA-13525)
 + * Fix repair process violating start/end token limits for small ranges (CASSANDRA-13052)
 + * Add storage port options to sstableloader (CASSANDRA-13518)
 + * Properly handle quoted index names in cqlsh DESCRIBE output (CASSANDRA-12847)
 + * Avoid reading static row twice from old format sstables (CASSANDRA-13236)
 + * Fix NPE in StorageService.excise() (CASSANDRA-13163)
 + * Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
 + * Fail repair if insufficient responses received (CASSANDRA-13397)
 + * Fix SSTableLoader fail when the loaded table contains dropped columns (CASSANDRA-13276)
 + * Avoid name clashes in CassandraIndexTest (CASSANDRA-13427)
 + * Handling partially written hint files (CASSANDRA-12728) 
 + * Interrupt replaying hints on decommission (CASSANDRA-13308)
 + * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
 +
 +3.0.13
 + * Make reading of range tombstones more reliable (CASSANDRA-12811)
 + * Fix startup problems due to schema tables not completely flushed (CASSANDRA-12213)
 + * Fix view builder bug that can filter out data on restart (CASSANDRA-13405)
 + * Fix 2i page size calculation when there are no regular columns (CASSANDRA-13400)
 + * Fix the conversion of 2.X expired rows without regular column data (CASSANDRA-13395)
 + * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
 + * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
 + * Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
 + * Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
 + * Fix code to not exchange schema across major versions (CASSANDRA-13274)
 + * Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
 + * Bugs handling range tombstones in the sstable iterators (CASSANDRA-13340)
 + * Fix CONTAINS filtering for null collections (CASSANDRA-13246)
 + * Applying: Use a unique metric reservoir per test run when using Cassandra-wide metrics
residing in MBeans (CASSANDRA-13216)
 + * Propagate row deletions in 2i tables on upgrade (CASSANDRA-13320)
 + * Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
 + * Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
 + * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
 + * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
 + * Fix NPE issue in StorageService (CASSANDRA-13060)
 +Merged from 2.2:
+  * upgrade JNA version to 4.4.0 (CASSANDRA-13072)
+  * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
 - * Fix JVM metric paths (CASSANDRA-13103)
   * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
   * Discard in-flight shadow round responses (CASSANDRA-12653)
   * Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2f742cd/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index ce12b90,c50d85b..de6564a
--- a/build.xml
+++ b/build.xml
@@@ -380,8 -377,19 +380,8 @@@
            <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3">
  		    <exclusion groupId="asm" artifactId="asm"/> <!-- this is the outdated version
3.1 -->
            </dependency>
-           <dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/>
 -          <dependency groupId="org.apache.pig" artifactId="pig" version="0.12.1">
 -          	<exclusion groupId="org.mortbay.jetty" artifactId="jetty"/>
 -            <exclusion groupId="hsqldb" artifactId="hsqldb"/> <!-- outdated version
-->
 -            <exclusion groupId="antlr" artifactId="antlr"/> <!-- outdated version
-->
 -          </dependency>
+           <dependency groupId="net.java.dev.jna" artifactId="jna" version="4.4.0"/>
  
 -          <dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">
 -            <exclusion groupId="xerces" artifactId="xercesImpl"/>
 -          	<exclusion groupId="org.mortbay.jetty" artifactId="jetty"/> <!-- older
version, also via hadoop-core + pig -->
 -          	<exclusion groupId="org.mortbay.jetty" artifactId="jetty-util"/> <!--
older version, also via hadoop-core + pig -->
 -            <exclusion groupId="org.apache.ant" artifactId="ant"/> <!-- older version
1.8.3 -->
 -          </dependency>
            <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/>
            <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/>
  


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message