Merge remote-tracking branch 'origin/master'

This commit is contained in:
Rob Austin
2014-08-07 17:13:35 +01:00
2 changed files with 27 additions and 8 deletions
+24 -4
View File
@@ -1,6 +1,26 @@
Chronicle-Map
=============
# Chronicle Map
Chronicle Map
* [Should I use Chronicle Queue or Chronicle Map](https://github.com/OpenHFT/Chronicle-Map/wiki#should-i-use-chronicle-queue-or-chronicle-map)
* [What is the difference between SharedHashMap and Chronicle Map](https://github.com/OpenHFT/Chronicle-Map/wiki#what-is-the-difference-between-sharedhashmap-and-chronicle-map)
* [Overview](https://github.com/OpenHFT/Chronicle-Map/wiki#overview)
* [Object Construction](https://github.com/OpenHFT/Chronicle-Map/wiki#construction)
* [Simple Construction](https://github.com/OpenHFT/Chronicle-Map/wiki#simple-construction)
* [Flow Interface](https://github.com/OpenHFT/Chronicle-Map/wiki#flow-interface)
* [Sharing Data Between Two or More Maps](https://github.com/OpenHFT/Chronicle-Map/wiki#sharing-data-between-two-or-more-maps)
* [Entries](https://github.com/OpenHFT/Chronicle-Map/wiki#entries)
* [Chronicle Map Interface](https://github.com/OpenHFT/Chronicle-Map/wiki#chronicle-map-interface)
* [Serialization](https://github.com/OpenHFT/Chronicle-Map/wiki#serialization)
* [Simple Types](https://github.com/OpenHFT/Chronicle-Map/wiki#simple-types)
* [Complex Types](https://github.com/OpenHFT/Chronicle-Map/wiki#complex-types)
* [TCP / UDP Replication](https://github.com/OpenHFT/Chronicle-Map/wiki#tcp--udp-replication)
* [TCP / UDP Background.](https://github.com/OpenHFT/Chronicle-Map/wiki#tcp--udp-background)
* [How to setup UDP Replication](https://github.com/OpenHFT/Chronicle-Map/wiki#how-to-setup-udp-replication)
* [TCP/IP Throttling](https://github.com/OpenHFT/Chronicle-Map/wiki#tcpip--throttling)
* [Replication How it works](https://github.com/OpenHFT/Chronicle-Map/wiki#replication-how-it-works)
* [Multiple Chronicle Maps on a the same server with Replication](https://github.com/OpenHFT/Chronicle-Map/wiki#multiple-chronicle-maps-on-a-the-same-server-with-replication)
* [Identifier for Replication](https://github.com/OpenHFT/Chronicle-Map/wiki#identifier-for-replication)
* [Bootstrapping](https://github.com/OpenHFT/Chronicle-Map/wiki#bootstrapping)
https://github.com/OpenHFT/Chronicle-Map/wiki
Performance Topics
* [Chronicle Map with Large Data ](https://github.com/OpenHFT/Chronicle-Map/wiki#chronicle-map-with-large-data)
* [Better to use small keys](https://github.com/OpenHFT/Chronicle-Map/wiki#better-to-use-small-keys)
+3 -4
View File
@@ -15,15 +15,14 @@
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>net.openhft</groupId>
<artifactId>java-parent-pom</artifactId>
<version>1.1.0</version>
<relativePath/>
<relativePath />
</parent>
<properties>
@@ -33,7 +32,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>chronicle-map</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.0.1-SNAPSHOT</version>
<name>OpenHFT/Chronicle-Map</name>
<description>Chronicle-Map</description>