Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3b388280 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3b388280 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3b388280 Branch: refs/heads/ignite-3484 Commit: 3b388280c67032ec25c4743129e55f0e62614198 Parents: dbedbba c6ac6a5 Author: devozerov <[email protected]> Authored: Wed Sep 6 17:34:30 2017 +0300 Committer: devozerov <[email protected]> Committed: Wed Sep 6 17:34:30 2017 +0300 ---------------------------------------------------------------------- modules/clients/pom.xml | 6 +- .../org/apache/ignite/internal/IgniteEx.java | 14 +++ .../apache/ignite/internal/IgniteKernal.java | 12 ++ .../ignite/internal/binary/BinaryContext.java | 14 +++ .../processors/cache/GridCacheProcessor.java | 8 ++ .../cache/GridCacheSharedContext.java | 20 ++++ .../binary/CacheObjectBinaryProcessorImpl.java | 3 +- .../dht/preloader/GridDhtPartitionDemander.java | 9 ++ .../org/apache/ignite/mxbean/IgniteMXBean.java | 21 ++++ .../IgniteClientReconnectBinaryContexTest.java | 115 +++++++++++++++++++ .../cache/CacheRebalancingSelfTest.java | 88 +++++++++++++- .../processors/igfs/IgfsIgniteMock.java | 10 ++ .../junits/multijvm/IgniteProcessProxy.java | 10 ++ .../IgniteClientReconnectTestSuite.java | 2 + .../Resource/InstanceResourceAttribute.cs | 3 +- modules/platforms/dotnet/docfx/.gitignore | 9 ++ .../dotnet/docfx/Apache.Ignite.docfx.json | 88 ++++++++++++++ modules/platforms/dotnet/docfx/README.txt | 2 + modules/platforms/dotnet/docfx/api/index.md | 5 + modules/platforms/dotnet/docfx/filterConfig.yml | 3 + .../platforms/dotnet/docfx/generate-docs.cmd | 1 + .../platforms/dotnet/docfx/images/favicon.ico | Bin 0 -> 1150 bytes .../dotnet/docfx/images/logo_ignite_32_32.png | Bin 0 -> 1676 bytes modules/platforms/dotnet/docfx/index.md | 10 ++ modules/platforms/dotnet/docfx/toc.yml | 3 + parent/pom.xml | 1 + 26 files changed, 448 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
