Merge remote-tracking branch 'remotes/origin/master' into ignite-5578
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f439649d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f439649d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f439649d Branch: refs/heads/ignite-5578 Commit: f439649d286a161cc6a95110f30574003ac3111d Parents: df15780 e93b284 Author: sboikov <[email protected]> Authored: Tue Jul 11 14:19:48 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Jul 11 14:19:48 2017 +0300 ---------------------------------------------------------------------- .../cache/CacheAffinitySharedManager.java | 211 +++++++------------ .../persistence/pagemem/PageMemoryImpl.java | 86 +++----- .../cache/persistence/wal/FileInput.java | 3 + .../utils/PlatformConfigurationUtils.java | 4 - .../tcp/internal/TcpDiscoveryStatistics.java | 6 +- .../Cache/Query/CacheQueriesTest.cs | 6 + .../Config/cache-query.xml | 1 - .../IgniteConfigurationSerializerTest.cs | 2 - .../IgniteConfigurationTest.cs | 3 +- .../Apache.Ignite.Core/IgniteConfiguration.cs | 11 +- 10 files changed, 125 insertions(+), 208 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f439649d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java ----------------------------------------------------------------------
