Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-1794
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/43e0f45d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/43e0f45d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/43e0f45d Branch: refs/heads/ignite-1794 Commit: 43e0f45d39bf0daea9cf3e395a7f311016a9604b Parents: 828fe15 8ad5a94 Author: sboikov <[email protected]> Authored: Fri Apr 21 12:06:29 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Apr 21 12:06:29 2017 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 1 - .../configuration/DataPageEvictionMode.java | 10 +- .../dht/preloader/GridDhtPreloader.java | 18 +- .../datastructures/DataStructuresProcessor.java | 3 +- .../datastructures/GridCacheLockImpl.java | 17 +- .../utils/PlatformConfigurationUtils.java | 172 ++++++++++++++++--- .../internal/GridCacheRecreateLockTest.java | 78 --------- .../testsuites/IgniteComputeGridTestSuite.java | 2 - .../Cache/CacheConfigurationTest.cs | 18 +- .../IgniteConfigurationSerializerTest.cs | 52 +++++- .../IgniteConfigurationTest.cs | 56 ++++++ .../Apache.Ignite.Core.csproj | 3 + .../Cache/Configuration/CacheConfiguration.cs | 22 +++ .../Cache/Configuration/DataPageEvictionMode.cs | 59 +++++++ .../Cache/Configuration/MemoryConfiguration.cs | 151 ++++++++++++++++ .../Configuration/MemoryPolicyConfiguration.cs | 119 +++++++++++++ .../Apache.Ignite.Core/IgniteConfiguration.cs | 21 +++ .../IgniteConfigurationSection.xsd | 92 ++++++++++ modules/web-console/backend/index.js | 5 +- 19 files changed, 759 insertions(+), 140 deletions(-) ----------------------------------------------------------------------
