Patrick Liu

changes for ONOS-159 and ONOS-160

Change-Id: I7d8ebbf0c6668b2a47b2c74c931dd850a5f5796e
...@@ -29,6 +29,11 @@ ...@@ -29,6 +29,11 @@
29 <password>rocks</password> 29 <password>rocks</password>
30 </group> 30 </group>
31 <management-center enabled="false">http://localhost:8080/mancenter</management-center> 31 <management-center enabled="false">http://localhost:8080/mancenter</management-center>
32 + <properties>
33 + <property name="hazelcast.max.no.heartbeat.seconds">30</property>
34 + <property name="hazelcast.merge.first.run.delay.seconds">30</property>
35 + <property name="hazelcast.merge.next.run.delay.seconds">30</property>
36 + </properties>
32 <network> 37 <network>
33 <port auto-increment="true" port-count="100">5701</port> 38 <port auto-increment="true" port-count="100">5701</port>
34 <outbound-ports> 39 <outbound-ports>
...@@ -177,7 +182,6 @@ ...@@ -177,7 +182,6 @@
177 com.hazelcast.map.merge.LatestUpdateMapMergePolicy ; entry with the latest update wins. 182 com.hazelcast.map.merge.LatestUpdateMapMergePolicy ; entry with the latest update wins.
178 --> 183 -->
179 <merge-policy>com.hazelcast.map.merge.PutIfAbsentMapMergePolicy</merge-policy> 184 <merge-policy>com.hazelcast.map.merge.PutIfAbsentMapMergePolicy</merge-policy>
180 -
181 </map> 185 </map>
182 186
183 <multimap name="default"> 187 <multimap name="default">
......