Merge branch 'stable-3.12'

* stable-3.12:
  Set the DiskStats.invalidatedCount to zero

Change-Id: Ied817f59d51cd0b5543944de3cb738b4a6113c0d

src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/ChronicleMapCacheImpl.java

diff --git a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/ChronicleMapCacheImpl.java b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/ChronicleMapCacheImpl.java
index 3d6fc6d..47aa5f7 100644
--- a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/ChronicleMapCacheImpl.java
+++ b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/ChronicleMapCacheImpl.java
@@ -38,6 +38,7 @@
     implements PersistentCache {
 
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+  private static final long DONT_TRACK_CACHE_INVALIDATIONS = 0L;
 
   private final ChronicleMapCacheConfig config;
   private final ChronicleMapStore<K, V> store;
@@ -353,7 +354,8 @@
         store.longSize(),
         config.getCacheFile().length(),
         hitCount.longValue(),
-        missCount.longValue());
+        missCount.longValue(),
+        DONT_TRACK_CACHE_INVALIDATIONS);
   }
 
   public CacheStats memStats() {