You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/01/12 07:54:24 UTC

[16/16] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-zk-join

Merge remote-tracking branch 'remotes/origin/master' into ignite-zk-join


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/52baf499
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/52baf499
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/52baf499

Branch: refs/heads/ignite-zk-join
Commit: 52baf4996570f512c736e9333b3e395f97e0b6f5
Parents: 2fc690e eeebfca
Author: sboikov <sb...@gridgain.com>
Authored: Fri Jan 12 10:53:20 2018 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jan 12 10:53:20 2018 +0300

----------------------------------------------------------------------
 bin/ignite.bat                                  |   2 +-
 bin/include/parseargs.bat                       |   2 +-
 .../apache/ignite/IgniteSystemProperties.java   |   6 +
 .../internal/client/impl/GridClientImpl.java    |  23 +-
 .../cache/CacheInvokeDirectResult.java          |  16 +-
 .../service/GridServiceProcessor.java           |   8 +
 .../util/tostring/GridToStringBuilder.java      | 103 ++++--
 .../startup/cmdline/CommandLineTransformer.java |   6 +-
 .../IgniteCacheFailedUpdateResponseTest.java    | 310 +++++++++++++++++++
 .../tostring/GridToStringBuilderSelfTest.java   |  56 ++++
 .../testsuites/IgniteCacheTestSuite4.java       |   2 +
 .../Apache.Ignite.Core.Tests.DotNetCore.csproj  |  15 +
 .../Binary/BinaryBuilderSelfTest.cs             |   2 -
 .../Cache/CacheAbstractTest.cs                  |   4 -
 .../Cache/CacheAbstractTransactionalTest.cs     |   8 +-
 .../Client/Cache/CreateCacheTest.cs             |   4 -
 .../Client/ClientConnectionTest.cs              |   2 -
 .../Compute/ComputeApiTest.cs                   |   8 -
 .../Log/CustomLoggerTest.cs                     |   2 -
 .../Services/ServiceProxyTest.cs                |  16 +-
 .../Services/ServicesTest.cs                    |  40 +--
 .../TestUtils.Common.cs                         |  19 --
 .../Apache.Ignite.Core.csproj                   |   4 +-
 .../Impl/Services/ServiceMethodHelper.cs        |  61 ++++
 .../Impl/Services/ServiceProxy.cs               |  75 -----
 .../Impl/Services/ServiceProxyFactory.cs        |  68 ++++
 .../Impl/Services/ServiceProxyTypeGenerator.cs  | 281 +++++++++++++++++
 .../Impl/Services/Services.cs                   |   8 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../util/nodestart/StartNodeCallableImpl.java   | 260 ++++++++++++++--
 modules/web-console/frontend/app/app.js         |   2 +
 .../app/components/grid-export/component.js     |  11 +-
 .../list-of-registered-users.controller.js      |   6 +-
 .../app/components/page-queries/controller.js   |  15 +-
 .../components/web-console-header/component.js  |   2 +-
 .../generator/ConfigurationGenerator.js         |  44 +--
 .../generator/JavaTransformer.service.js        |  11 +-
 .../generator/SpringTransformer.service.js      |  12 +-
 .../configuration/clusters/marshaller.pug       |  67 ++--
 .../states/configuration/clusters/misc.pug      |   2 +-
 .../frontend/app/primitives/btn/index.scss      |   2 +-
 .../web-console/frontend/app/services/CSV.js    |  22 ++
 42 files changed, 1312 insertions(+), 299 deletions(-)
----------------------------------------------------------------------