Merge branches 'ignite-1.6' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6b3328b3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6b3328b3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6b3328b3 Branch: refs/heads/master Commit: 6b3328b3765167a9f08390ad6ba00bbb60743fe6 Parents: d1151d4 e5be386 Author: Alexey Kuznetsov <[email protected]> Authored: Thu May 12 11:20:07 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Thu May 12 11:20:07 2016 +0700 ---------------------------------------------------------------------- .gitignore | 42 +- .../utils/PlatformConfigurationUtils.java | 54 +++ .../cpp/core/include/ignite/cache/cache_entry.h | 2 +- modules/platforms/cpp/examples/Makefile.am | 1 + modules/platforms/cpp/examples/configure.ac | 2 + .../examples/include/ignite/examples/address.h | 9 +- .../include/ignite/examples/organization.h | 20 +- .../cpp/examples/project/vs/ignite-examples.sln | 6 + .../cpp/examples/query-example/Makefile.am | 56 +++ .../query-example/config/query-example.xml | 121 ++++++ .../project/vs/query-example.vcxproj | 108 +++++ .../project/vs/query-example.vcxproj.filters | 27 ++ .../query-example/src/query_example.cpp | 405 +++++++++++++++++++ .../cpp/odbc/src/config/configuration.cpp | 2 +- .../Apache.Ignite.Core.Tests.csproj | 2 + .../IgniteConfigurationSerializerTest.cs | 27 ++ .../IgniteConfigurationTest.cs | 44 +- .../WindowsServiceTest.cs | 124 ++++++ .../Apache.Ignite.Core.csproj | 2 + .../Communication/ICommunicationSpi.cs | 37 ++ .../Communication/Tcp/TcpCommunicationSpi.cs | 283 +++++++++++++ .../Apache.Ignite.Core/IgniteConfiguration.cs | 28 ++ .../IgniteConfigurationSection.xsd | 22 + .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 6 + .../Impl/Unmanaged/UnmanagedCallbacks.cs | 6 + .../dotnet/Apache.Ignite/Apache.Ignite.csproj | 5 +- .../dotnet/Apache.Ignite/Config/Configurator.cs | 5 + .../Apache.Ignite/Service/IgniteService.cs | 102 ++--- .../Service/IgniteServiceInstaller.cs | 64 +++ .../Apache.Ignite/Service/NativeMethods.cs | 57 --- .../commands/disco/VisorDiscoveryCommand.scala | 7 +- .../commands/events/VisorEventsCommand.scala | 7 +- .../commands/tasks/VisorTasksCommand.scala | 7 +- 33 files changed, 1533 insertions(+), 157 deletions(-) ----------------------------------------------------------------------
