Merge branch 'master' of https://github.com/apache/ignite into ignite-2308
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/683fea8e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/683fea8e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/683fea8e Branch: refs/heads/ignite-2308 Commit: 683fea8e62544a3b67b56747626288716078874b Parents: 922a4da dffcb83 Author: iveselovskiy <[email protected]> Authored: Wed Dec 30 22:48:10 2015 +0300 Committer: iveselovskiy <[email protected]> Committed: Wed Dec 30 22:48:10 2015 +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(-) ----------------------------------------------------------------------
