Repository: ignite Updated Branches: refs/heads/ignite-1537 a4ae7ed75 -> 6447fa96d
ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6447fa96 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6447fa96 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6447fa96 Branch: refs/heads/ignite-1537 Commit: 6447fa96d5cfd79bef802bdd6de22f6351111679 Parents: a4ae7ed Author: sboikov <[email protected]> Authored: Mon Dec 21 14:06:53 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Dec 21 14:06:53 2015 +0300 ---------------------------------------------------------------------- modules/core/src/test/config/websession/example-cache.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6447fa96/modules/core/src/test/config/websession/example-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/websession/example-cache.xml b/modules/core/src/test/config/websession/example-cache.xml index d5bfeb7..0cc0e1e 100644 --- a/modules/core/src/test/config/websession/example-cache.xml +++ b/modules/core/src/test/config/websession/example-cache.xml @@ -130,14 +130,7 @@ <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> - <!-- - Ignite provides several options for automatic discovery that can be used - instead os static IP based discovery. For information on all options refer - to our documentation: http://apacheignite.readme.io/docs/cluster-config - --> - <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. --> - <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">--> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> + <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> <property name="addresses"> <list> <!-- In distributed environment, replace with actual host IP address. -->
