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
@@ -144,6 +144,7 @@ abstract class AbstractChronicleMapBuilder<K, V,
private SingleChronicleHashReplication singleHashReplication = null;
private InetSocketAddress[] pushToAddresses;
public boolean bootstapOnlyLocalEntries = false;
AbstractChronicleMapBuilder(Class<K> keyClass, Class<V> valueClass) {
keyBuilder = new SerializationBuilder<K>(keyClass, SerializationBuilder.Role.KEY);
@@ -997,6 +998,13 @@ abstract class AbstractChronicleMapBuilder<K, V,
return this;
}
@Override
public ChronicleMapBuilderI<K, V> bootstapOnlyLocalEntries(boolean bootstapOnlyLocalEntries) {
this.bootstapOnlyLocalEntries = bootstapOnlyLocalEntries;
return this;
}
public String name() {
return this.name;
}