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

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Robert Stupp 2017-04-09 10:59:18 +02:00
parent 7fa1577c2d c38e618d69
commit 333ebd67a0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -118,6 +118,7 @@ Merged from 3.0:
for a table that's in system_schema.tables (CASSANDRA-13180) for a table that's in system_schema.tables (CASSANDRA-13180)
* Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410) * Nodetool upgradesstables/scrub/compact ignores system tables (CASSANDRA-13410)
Merged from 2.2: Merged from 2.2:
* Fix weightedSize() for row-cache reported by JMX and NodeTool (CASSANDRA-13393)
* Fix JVM metric names (CASSANDRA-13103) * Fix JVM metric names (CASSANDRA-13103)
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773) * Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653) * Discard in-flight shadow round responses (CASSANDRA-12653)

2
src/java/org/apache/cassandra/cache/OHCProvider.java vendored
View File

@ -96,7 +96,7 @@ public class OHCProvider implements CacheProvider<RowCacheKey, IRowCacheEntry>
public long weightedSize() public long weightedSize()
{ {
return ohCache.size(); return ohCache.memUsed();
} }
public void clear() public void clear()