mirror of https://github.com/apache/cassandra
Merge branch cassandra-3.11 into trunk
This commit is contained in:
commit
ea57a4dbe8
|
|
@ -163,6 +163,7 @@ Merged from 3.0:
|
|||
* Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
|
||||
* Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
|
||||
Merged from 2.2:
|
||||
* Upgrade JNA to version 4.4.0 (CASSANDRA-13072)
|
||||
* Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
|
||||
* Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
|
||||
* Fix JVM metric names (CASSANDRA-13103)
|
||||
|
|
|
|||
|
|
@ -397,7 +397,7 @@
|
|||
<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="net.java.dev.jna" artifactId="jna" version="4.4.0"/>
|
||||
|
||||
<dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/>
|
||||
<dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue