Merge remote-tracking branch 'remotes/origin/master' 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/c8849645 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c8849645 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c8849645 Branch: refs/heads/ignite-zk Commit: c884964574cbaf8e90c4d07c23617d95d08930f5 Parents: 0bbf607 4e24927 Author: sboikov <sboi...@gridgain.com> Authored: Wed Jan 10 11:14:44 2018 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Jan 10 11:14:44 2018 +0300 ---------------------------------------------------------------------- .../ignite/internal/IgniteNodeAttributes.java | 3 + .../discovery/GridDiscoveryManager.java | 92 ++++++++++++++++++-- .../pagemem/impl/PageMemoryNoStoreImpl.java | 14 +-- .../persistence/pagemem/PageMemoryImpl.java | 68 ++++++++++++++- .../ignite/internal/util/IgniteUtils.java | 18 ++++ .../persistence/pagemem/PageMemoryImplTest.java | 16 +++- 6 files changed, 194 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c8849645/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ----------------------------------------------------------------------
