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 2017/10/26 08:29:01 UTC
[6/7] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-6667
Merge remote-tracking branch 'remotes/origin/master' into ignite-6667
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1b4bf609
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1b4bf609
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1b4bf609
Branch: refs/heads/ignite-6667
Commit: 1b4bf609b4113de055ddd36c8bb51e75324d5200
Parents: 46501d9 8266a98
Author: sboikov <sb...@gridgain.com>
Authored: Thu Oct 26 11:18:14 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Oct 26 11:18:14 2017 +0300
----------------------------------------------------------------------
.../configuration/DataRegionConfiguration.java | 34 ++-
.../configuration/DataStorageConfiguration.java | 29 ---
.../MemoryPolicyConfiguration.java | 23 --
.../org/apache/ignite/internal/IgnitionEx.java | 13 +-
.../discovery/GridDiscoveryManager.java | 8 +-
.../pagemem/impl/PageMemoryNoStoreImpl.java | 6 +-
.../dht/atomic/GridDhtAtomicCache.java | 7 +-
.../GridCacheDatabaseSharedManager.java | 71 ++----
.../datastreamer/DataStreamerImpl.java | 23 +-
.../utils/PlatformConfigurationUtils.java | 6 +-
.../node/VisorDataRegionConfiguration.java | 13 +
.../node/VisorDataStorageConfiguration.java | 3 +-
.../node/VisorPersistentStoreConfiguration.java | 1 -
.../communication/tcp/TcpCommunicationSpi.java | 14 +-
.../cache/IgniteOutOfMemoryPropagationTest.java | 251 +++++++++++++++++++
.../persistence/db/wal/IgnitePdsWalTlbTest.java | 7 +-
.../pagemem/PagesWriteThrottleSandboxTest.java | 2 +-
.../pagemem/PagesWriteThrottleSmokeTest.java | 2 +-
.../testsuites/IgniteCacheTestSuite6.java | 5 +
modules/dev-utils/pom.xml | 13 +
.../Config/full-config.xml | 6 +-
.../IgniteConfigurationSerializerTest.cs | 6 +-
.../IgniteConfigurationTest.cs | 6 +-
.../Configuration/DataRegionConfiguration.cs | 8 +
.../Configuration/DataStorageConfiguration.cs | 9 -
.../IgniteConfigurationSection.xsd | 15 +-
modules/web-console/backend/app/mongo.js | 6 +-
.../generator/ConfigurationGenerator.js | 5 +-
.../generator/defaults/Cluster.service.js | 3 +-
.../configuration/clusters/data-storage.pug | 6 +
30 files changed, 445 insertions(+), 156 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b4bf609/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------