Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
This commit is contained in:
Peter Lawrey
2014-11-18 20:59:20 +00:00
9 changed files with 78 additions and 34 deletions
@@ -497,7 +497,21 @@ public final class ChronicleMapBuilder<K, V> implements ChronicleMapBuilderI<K,
@Override
public ChronicleMap<K, V> createPersistedTo(File file) throws IOException {
return delegate.createPersistedTo(file);
return delegate.createPersistedTo(file);
}
/**
* @param bootstapOnlyLocalEntries if set to true - when a new node joins a TCP replication grid, the new
* node will be populated with data, only for the nodes that created that
* data. Otherwise, all the nodes will publish all the data they have (
* potentially swamping the new node with duplicates ) however this does
* guarantee that all the data is replicated over to the new node, and is
* useful especially in the case that the originating node is not
* currently running.
*/
public ChronicleMapBuilder<K, V> bootstapOnlyLocalEntries(boolean bootstapOnlyLocalEntries) {
delegate.bootstapOnlyLocalEntries(bootstapOnlyLocalEntries);
return this;
}
}