Merge with master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ebbc8903 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ebbc8903 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ebbc8903 Branch: refs/heads/ignite-3199-1 Commit: ebbc8903c6e5fd260588b39f64a242f492c6bc0a Parents: 99b7869 e7ae5c8 Author: Pavel Tupitsyn <ptupit...@apache.org> Authored: Fri Sep 16 12:00:29 2016 +0300 Committer: Pavel Tupitsyn <ptupit...@apache.org> Committed: Fri Sep 16 12:00:29 2016 +0300 ---------------------------------------------------------------------- .../persistence/KeyPersistenceSettings.java | 6 +- .../KeyValuePersistenceSettings.java | 4 +- .../persistence/PersistenceController.java | 26 +- .../persistence/PersistenceSettings.java | 4 +- .../store/cassandra/persistence/PojoField.java | 2 +- .../cassandra/persistence/PojoValueField.java | 6 +- .../store/cassandra/utils/DDLGenerator.java | 10 + .../configuration/CacheConfiguration.java | 35 ++- .../cache/query/GridCacheQueryManager.java | 13 +- .../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 + ...gniteCacheReplicatedFieldsQuerySelfTest.java | 6 +- .../IgniteCacheReplicatedQuerySelfTest.java | 4 +- modules/platforms/cpp/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../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 +- .../org/apache/ignite/yardstick/IgniteNode.java | 74 +++--- 37 files changed, 737 insertions(+), 204 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ebbc8903/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ebbc8903/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs ----------------------------------------------------------------------
