Merge branches 'ignite-3443' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-3443
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d8b92b4b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d8b92b4b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d8b92b4b Branch: refs/heads/ignite-3443 Commit: d8b92b4b45f8332b839908c2d524a55d8f52425a Parents: 8033f11 59fb5ef Author: Alexey Kuznetsov <[email protected]> Authored: Thu Aug 4 16:52:03 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu Aug 4 16:52:03 2016 +0700 ---------------------------------------------------------------------- .../configuration/BasicAddressResolver.java | 146 ++++++++++++ .../spi/GridTcpSpiForwardingSelfTest.java | 237 +++++++++++++++++-- .../IgniteConfigurationSerializerTest.cs | 145 ++++++++++-- .../Apache.Ignite.Core/IgniteConfiguration.cs | 65 +++++ 4 files changed, 559 insertions(+), 34 deletions(-) ----------------------------------------------------------------------
