Merge remote-tracking branch 'origin/ignite-zk' into ignite-zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/09ab8649 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/09ab8649 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/09ab8649 Branch: refs/heads/ignite-zk Commit: 09ab8649d4973fb71b27a62d6f12d668c085a2b5 Parents: c2ed250 4e8516d Author: sboikov <sboi...@gridgain.com> Authored: Tue Dec 26 14:21:52 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Dec 26 14:21:52 2017 +0300 ---------------------------------------------------------------------- .../managers/discovery/GridDiscoveryManager.java | 4 +++- .../ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java | 2 +- .../processors/cache/GridCacheAbstractSelfTest.java | 4 +++- .../cache/IgniteCacheNearLockValueSelfTest.java | 4 +++- .../cache/IgniteCacheP2pUnmarshallingErrorTest.java | 11 +++++++++++ .../GridCacheClientModesAbstractSelfTest.java | 3 ++- .../cache/distributed/IgniteCache150ClientsTest.java | 2 ++ ...chePartitionedClientOnlyNoPrimaryFullApiSelfTest.java | 5 +++-- .../ignite/testsuites/IgniteCacheFailoverTestSuite.java | 3 ++- 9 files changed, 30 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
