Merge branch 'ignite-1.7.3' into UPSTREAM_master # Conflicts: # modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs # modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeFunc.cs # modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeJob.cs # modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeOutFunc.cs
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a370bad1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a370bad1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a370bad1 Branch: refs/heads/ignite-2788 Commit: a370bad1463deade9a6fb975fd0b7297df2deaa9 Parents: a01927a d45383b Author: Pavel Tupitsyn <[email protected]> Authored: Tue Oct 4 18:55:19 2016 +0300 Committer: Pavel Tupitsyn <[email protected]> Committed: Tue Oct 4 18:55:19 2016 +0300 ---------------------------------------------------------------------- .../dotnet/Apache.Ignite.Core/IgniteConfiguration.cs | 2 +- .../dotnet/Apache.Ignite.Core/Impl/Compute/ComputeFunc.cs | 5 ++++- .../dotnet/Apache.Ignite.Core/Impl/Compute/ComputeJob.cs | 10 ++++++++-- .../Apache.Ignite.Core/Impl/Compute/ComputeOutFunc.cs | 5 ++++- 4 files changed, 17 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a370bad1/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a370bad1/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeFunc.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a370bad1/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeJob.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a370bad1/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Compute/ComputeOutFunc.cs ----------------------------------------------------------------------
