Merge branch 'ignite-1282' into ignite-1655
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/61d43948 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/61d43948 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/61d43948 Branch: refs/heads/ignite-1655 Commit: 61d43948ec520e905ea6926373d3ab5d3357c71b Parents: f128806 b1b8094 Author: vozerov-gridgain <[email protected]> Authored: Wed Oct 21 11:42:58 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Oct 21 11:42:58 2015 +0300 ---------------------------------------------------------------------- .../platform/PlatformContextImpl.java | 1 + .../Cache/CacheAbstractTest.cs | 159 +++++++++------ .../Cache/CacheTestAsyncWrapper.cs | 35 +++- .../Dataload/DataStreamerTest.cs | 6 +- .../IgniteStartStopTest.cs | 6 +- .../Apache.Ignite.Core.Tests/MessagingTest.cs | 4 +- .../Portable/PortableSelfTest.cs | 56 +++-- .../Apache.Ignite.Core.csproj | 1 + .../Apache.Ignite.Core/Cache/CacheResult.cs | 98 +++++++++ .../dotnet/Apache.Ignite.Core/Cache/ICache.cs | 62 +++++- .../Apache.Ignite.Core/Cluster/IClusterNode.cs | 11 + .../Apache.Ignite.Core/Common/IgniteGuid.cs | 13 +- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 204 ++++++++++++++++--- .../Apache.Ignite.Core/Impl/Cache/CacheOp.cs | 1 + .../Impl/Cache/CacheProxyImpl.cs | 33 ++- .../Impl/Cluster/ClusterNodeImpl.cs | 45 ++-- .../Apache.Ignite.Core/Impl/Common/Future.cs | 16 +- .../Impl/Common/FutureConverter.cs | 4 +- .../Impl/Common/IFutureConverter.cs | 1 + .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 30 +-- .../Impl/Messaging/Messaging.cs | 2 +- .../Apache.Ignite.Core/Impl/PlatformTarget.cs | 1 + .../Impl/Portable/PortableReaderImpl.cs | 4 + .../Apache.Ignite.Core/Messaging/IMessaging.cs | 2 +- 24 files changed, 577 insertions(+), 218 deletions(-) ----------------------------------------------------------------------
