You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/01/02 19:52:09 UTC
[8/8] ignite git commit: Merge branch 'master' into ignite-2265
Merge branch 'master' into ignite-2265
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5c1cd29c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5c1cd29c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5c1cd29c
Branch: refs/heads/ignite-2265
Commit: 5c1cd29c5bedba24972ab242d177e26e682e4592
Parents: d4d7c24 dffcb83
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Sat Jan 2 21:52:57 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Sat Jan 2 21:52:57 2016 +0300
----------------------------------------------------------------------
doap_Ignite.rdf | 67 ++++++
.../version/GridCachePlainVersionedEntry.java | 2 +-
.../platform/PlatformAbstractTarget.java | 17 +-
.../processors/platform/PlatformTarget.java | 22 ++
.../platform/compute/PlatformCompute.java | 34 ++-
.../platform/utils/PlatformFutureUtils.java | 119 +++++++---
.../platform/utils/PlatformListenable.java | 47 ++++
.../ignite/internal/util/IgniteUtils.java | 40 ++++
.../ignite/internal/util/nio/GridNioServer.java | 16 +-
.../cache/IgniteCacheStoreCollectionTest.java | 163 +++++++++++++
.../cpp/common/include/ignite/common/exports.h | 7 +-
.../cpp/common/include/ignite/common/java.h | 13 +-
.../platforms/cpp/common/project/vs/module.def | 6 +-
modules/platforms/cpp/common/src/exports.cpp | 20 +-
modules/platforms/cpp/common/src/java.cpp | 70 +++++-
.../Compute/ComputeApiTest.cs | 20 ++
.../Apache.Ignite.Core.csproj | 2 +
.../Common/IgniteFutureCancelledException.cs | 65 ++++++
.../Apache.Ignite.Core/Compute/ICompute.cs | 233 +++++++++++++++++++
.../Impl/Common/CancelledTask.cs | 47 ++++
.../Apache.Ignite.Core/Impl/Common/Future.cs | 74 +++++-
.../Apache.Ignite.Core/Impl/Compute/Compute.cs | 157 ++++++++++++-
.../Impl/Compute/ComputeImpl.cs | 15 +-
.../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 4 +
.../Apache.Ignite.Core/Impl/PlatformTarget.cs | 52 +++++
.../Impl/Unmanaged/IgniteJniNativeMethods.cs | 16 +-
.../Impl/Unmanaged/UnmanagedUtils.cs | 31 ++-
27 files changed, 1276 insertions(+), 83 deletions(-)
----------------------------------------------------------------------