Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/612f5ad5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/612f5ad5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/612f5ad5 Branch: refs/heads/ignite-5272 Commit: 612f5ad5ea6deaf7addd39ebfc6956adcfb9a545 Parents: c73aad7 d5ecf0a Author: devozerov <[email protected]> Authored: Thu Jun 8 13:58:53 2017 +0300 Committer: devozerov <[email protected]> Committed: Thu Jun 8 13:58:53 2017 +0300 ---------------------------------------------------------------------- .../utils/PlatformConfigurationUtils.java | 6 ++++++ .../Cache/CacheConfigurationTest.cs | 8 ++++++++ .../IgniteConfigurationSerializerTest.cs | 5 +++-- .../IgniteConfigurationTest.cs | 4 ++++ .../Cache/Configuration/CacheConfiguration.cs | 9 +++++++++ .../Apache.Ignite.Core/IgniteConfiguration.cs | 20 ++++++++++++++++++++ .../IgniteConfigurationSection.xsd | 7 +++++++ 7 files changed, 57 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
