Merge remote-tracking branch 'origin/master'

This commit is contained in:
Peter Lawrey
2018-06-05 11:33:39 +01:00
4 changed files with 14 additions and 6 deletions
+10
View File
@@ -1,5 +1,15 @@
= Chronicle Map
image::docs\images\Map_line.png[width=20%]
==== Version
[#image-maven]
[caption="", link=https://maven-badges.herokuapp.com/maven-central/net.openhft/chronicle-map]
image::https://maven-badges.herokuapp.com/maven-central/net.openhft/chronicle-map/badge.svg[]
== Overview
Chronicle Map is a super-fast, in-memory, non-blocking, key-value store, designed for low-latency, and/or multi-process
applications such as trading and financial market applications.
See <<docs/CM_Features.adoc#,Features doc>> for more information.
Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

+2 -2
View File
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>chronicle-map</artifactId>
<version>3.14.7-SNAPSHOT</version>
<version>3.16.0-SNAPSHOT</version>
<name>OpenHFT/Chronicle-Map</name>
<description>Chronicle-Map</description>
<packaging>bundle</packaging>
@@ -45,7 +45,7 @@
<dependency>
<groupId>net.openhft</groupId>
<artifactId>chronicle-bom</artifactId>
<version>1.15.270</version>
<version>1.15.337</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -24,10 +24,7 @@ import net.openhft.chronicle.core.values.IntValue;
import net.openhft.chronicle.hash.serialization.impl.StringSizedReader;
import net.openhft.chronicle.hash.serialization.impl.StringUtf8DataAccess;
import net.openhft.chronicle.values.Values;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.*;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -148,6 +145,7 @@ public class MemoryLeaksTest {
}
}
@Ignore("see https://github.com/OpenHFT/Chronicle-Map/issues/153")
@Test(timeout = 60_000)
public void testExplicitChronicleMapCloseReleasesMemory()
throws IOException, InterruptedException {