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/03/09 07:48:43 UTC

[10/18] ignite git commit: Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/master'


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

Branch: refs/heads/ignite-2753
Commit: b4b251135a4cacf2b1e1f4c00bc2766a2dced681
Parents: 92d8561 b99714d
Author: dkarachentsev <dk...@gridgain.com>
Authored: Sat Feb 20 10:26:18 2016 +0300
Committer: dkarachentsev <dk...@gridgain.com>
Committed: Sat Feb 20 10:26:18 2016 +0300

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 .../processors/cache/GridCacheMapEntry.java     |  15 +-
 .../processors/cache/dr/GridCacheDrManager.java |   4 +-
 .../cache/dr/GridOsCacheDrManager.java          |   3 +-
 .../datastructures/PlatformAtomicReference.java |   7 +-
 .../IgniteBinaryObjectQueryArgumentsTest.java   | 161 +++++++++++++++++++
 .../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 +
 34 files changed, 1363 insertions(+), 79 deletions(-)
----------------------------------------------------------------------