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 2016/02/20 07:20:14 UTC

[7/7] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-324

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


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

Branch: refs/heads/ignite-324
Commit: 8e5ebf6cdfb5f24f312e2fd15b2f982b1d4a8fcd
Parents: cc1ba72 883436c
Author: sboikov <sb...@gridgain.com>
Authored: Sat Feb 20 09:19:48 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Sat Feb 20 09:19:48 2016 +0300

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 .../processors/cache/GridCacheMapEntry.java     |  15 +--
 .../processors/cache/dr/GridCacheDrManager.java |   4 +-
 .../cache/dr/GridOsCacheDrManager.java          |   3 +-
 .../datastructures/PlatformAtomicReference.java |   7 +-
 .../Apache.Ignite.Core.Tests.NuGet.csproj       | 103 ++++++++++++++++++
 .../Apache.Ignite.Core.Tests.NuGet.sln          |  26 +++++
 ...ache.Ignite.Core.Tests.NuGet.sln.DotSettings |   4 +
 .../Apache.Ignite.Core.Tests.NuGet/CacheTest.cs | 107 +++++++++++++++++++
 .../ComputeTest.cs                              |  84 +++++++++++++++
 .../Config/ignite-config.xml                    |  50 +++++++++
 .../Apache.Ignite.Core.Tests.NuGet/NuGet.config |  34 ++++++
 .../Properties/AssemblyInfo.cs                  |  35 ++++++
 .../StartupTest.cs                              |  66 ++++++++++++
 .../TestRunner.cs                               |  70 ++++++++++++
 .../Apache.Ignite.Core.Tests.NuGet/TestUtil.cs  |  43 ++++++++
 .../install-package.cmd                         |   3 +
 .../IgniteStartStopTest.cs                      |  58 +++-------
 .../Apache.Ignite.Core.csproj                   |   4 +
 .../Apache.Ignite.Core.nuspec                   |  80 ++++++++++++++
 .../dotnet/Apache.Ignite.Core/Ignition.cs       |  56 ++++++++--
 .../Impl/Common/IgniteHome.cs                   |  11 +-
 .../Impl/DataStructures/AtomicReference.cs      |   2 +-
 .../dotnet/Apache.Ignite.Core/NuGet/Install.ps1 |  27 +++++
 .../NuGet/LINQPad/ComputeExample.linq           | 106 ++++++++++++++++++
 .../NuGet/LINQPad/PutGetExample.linq            |  69 ++++++++++++
 .../NuGet/LINQPad/QueryExample.linq             |  96 +++++++++++++++++
 .../Apache.Ignite.Core/NuGet/PostBuild.ps1      |  20 ++++
 .../Apache.Ignite.Core/NuGet/Uninstall.ps1      |  21 ++++
 .../apache/ignite/yarn/ApplicationMaster.java   |  30 ++++--
 .../apache/ignite/yarn/IgniteYarnClient.java    |  25 +++++
 .../ignite/yarn/utils/IgniteYarnUtils.java      |  19 ++++
 parent/pom.xml                                  |   2 +
 33 files changed, 1202 insertions(+), 79 deletions(-)
----------------------------------------------------------------------