Merge remote-tracking branch 'origin/ignite-2.0' into ignite-2.0
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/09f64e5a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/09f64e5a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/09f64e5a Branch: refs/heads/ignite-3477-master Commit: 09f64e5a9b43bec3340ca4f6b14b0e49293b6111 Parents: 81c1964 47189d2 Author: sboikov <[email protected]> Authored: Mon Mar 20 12:49:49 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Mar 20 12:49:49 2017 +0300 ---------------------------------------------------------------------- .../Apache.Ignite.AspNet.Tests/App.config | 6 ++-- .../IgniteOutputCacheProviderTest.cs | 2 +- .../IgniteSessionStateStoreProviderTest.cs | 2 +- .../Apache.Ignite.AspNet/Impl/ConfigUtil.cs | 4 +-- .../Binary/BinaryBuilderSelfTest.cs | 2 +- .../Cache/Affinity/AffinityFieldTest.cs | 2 +- .../Cache/Affinity/AffinityFunctionTest.cs | 4 +-- .../Cache/Affinity/AffinityTest.cs | 2 +- .../Cache/CacheAbstractTest.cs | 2 +- .../Cache/CacheConfigurationTest.cs | 2 +- .../Cache/CacheDynamicStartTest.cs | 2 +- .../Cache/CacheMetricsTest.cs | 2 +- .../Cache/CacheNearTest.cs | 4 +-- .../Cache/Query/CacheLinqTest.cs | 2 +- .../Cache/Query/CacheQueriesTest.cs | 2 +- .../Continuous/ContinuousQueryAbstractTest.cs | 4 +-- .../Continuous/ContinuousQueryJavaFilterTest.cs | 2 +- .../Cache/Store/CacheStoreSessionTest.cs | 2 +- .../Cache/Store/CacheStoreTest.cs | 2 +- .../Compute/ComputeApiTest.cs | 2 +- .../Cache/Affinity/affinity-function2.xml | 2 +- .../Config/Compute/compute-grid1.xml | 2 +- .../Config/Compute/compute-grid2.xml | 2 +- .../Config/Compute/compute-grid3.xml | 2 +- .../Config/Lifecycle/lifecycle-beans.xml | 2 +- .../Config/Lifecycle/lifecycle-no-beans.xml | 2 +- .../Config/start-test-grid1.xml | 2 +- .../Config/start-test-grid2.xml | 2 +- .../ConsoleRedirectTest.cs | 2 +- .../Dataload/DataStreamerTest.cs | 2 +- .../Dataload/DataStreamerTestTopologyChange.cs | 2 +- .../Apache.Ignite.Core.Tests/ExceptionsTest.cs | 2 +- .../IgniteConfigurationSectionTest.cs | 2 +- .../IgniteConfigurationSerializerTest.cs | 19 ++++++----- .../IgniteConfigurationTest.cs | 10 +++--- .../Log/CustomLoggerTest.cs | 2 +- .../Plugin/Cache/CachePluginTest.cs | 4 +-- .../Apache.Ignite.Core.Tests/ReconnectTest.cs | 2 +- .../SerializationTest.cs | 2 +- .../dotnet/Apache.Ignite.Core.Tests/app.config | 4 +-- .../Apache.Ignite.Core.Tests/custom_app.config | 2 +- .../Apache.Ignite.Core/IgniteConfiguration.cs | 24 ++++++++++++-- .../IgniteConfigurationSection.xsd | 2 +- .../dotnet/Apache.Ignite.Core/Ignition.cs | 2 +- .../Common/IgniteConfigurationXmlSerializer.cs | 34 +++++++++++++++++--- .../App.config | 4 +-- .../EntityFrameworkCacheInitializationTest.cs | 2 +- .../EntityFrameworkCacheTest.cs | 2 +- .../IgniteDbConfiguration.cs | 4 +-- .../Misc/ClientReconnectExample.cs | 2 +- 50 files changed, 123 insertions(+), 76 deletions(-) ----------------------------------------------------------------------
