ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ptupit...@apache.org
Subject [12/13] ignite git commit: Merge branch ignite-1.7.2 to master.
Date Fri, 16 Sep 2016 09:00:53 GMT
Merge branch ignite-1.7.2 to master.


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

Branch: refs/heads/ignite-3199-1
Commit: e7ae5c8ddd8b9e1eca0a1e366002bcd6f32e72df
Parents: 3db0a3d ccd036c
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Fri Sep 16 15:42:56 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Fri Sep 16 15:42:56 2016 +0700

----------------------------------------------------------------------
 .../hadoop/fs/BasicHadoopFileSystemFactory.java |  17 +-
 .../processors/hadoop/HadoopClassLoader.java    |   6 +-
 .../processors/hadoop/HadoopClasspathMain.java  |   2 +-
 .../processors/hadoop/HadoopClasspathUtils.java | 230 +++++++++++++---
 .../processors/hadoop/HadoopDefaultJobInfo.java |   1 -
 .../internal/processors/hadoop/HadoopUtils.java |  53 ++--
 .../processors/hadoop/v2/HadoopV2Job.java       |  32 +--
 .../hadoop/v2/HadoopV2JobResourceManager.java   |   5 +-
 .../hadoop/v2/HadoopV2TaskContext.java          |  15 +-
 .../igfs/HadoopFIleSystemFactorySelfTest.java   |  10 -
 .../processors/hadoop/HadoopTestUtils.java      |  73 +++++-
 .../hadoop/HadoopUserLibsSelfTest.java          | 260 +++++++++++++++++++
 .../testsuites/IgniteHadoopTestSuite.java       |   3 +
 modules/platforms/cpp/configure.ac              |   2 +-
 modules/platforms/cpp/examples/configure.ac     |   2 +-
 .../Properties/AssemblyInfo.cs                  |   6 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Apache.Ignite/Properties/AssemblyInfo.cs    |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 .../Properties/AssemblyInfo.cs                  |   4 +-
 25 files changed, 622 insertions(+), 131 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e7ae5c8d/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs
index ad8e4fc,ad61ecd..4981946
--- a/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs
@@@ -32,8 -32,8 +32,8 @@@ using System.Runtime.InteropServices
  
  [assembly: Guid("13ea96fc-cc83-4164-a7c0-4f30ed797460")]
  
- [assembly: AssemblyVersion("1.8.0.13244")]
- [assembly: AssemblyFileVersion("1.8.0.13244")]
+ [assembly: AssemblyVersion("1.8.0.14218")]
+ [assembly: AssemblyFileVersion("1.8.0.14218")]
  [assembly: AssemblyInformationalVersion("1.8.0")]
  
--[assembly: CLSCompliant(true)]
++[assembly: CLSCompliant(true)]


Mime
View raw message