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/4ae61ce9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ae61ce9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ae61ce9 Branch: refs/heads/ignite-1093-2 Commit: 4ae61ce9e992f8930432e5e3f85b293cb9784dd3 Parents: 9601736 72e9973 Author: Anton Vinogradov <[email protected]> Authored: Thu Sep 10 13:06:39 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Sep 10 13:06:39 2015 +0300 ---------------------------------------------------------------------- .../internal/portable/PortableContext.java | 6 +- .../dotnet/PlatformDotNetConfiguration.java | 119 +++++++++ .../PlatformDotNetPortableConfiguration.java | 228 +++++++++++++++++ ...PlatformDotNetPortableTypeConfiguration.java | 248 +++++++++++++++++++ .../dotnet/PlatformDotNetConfiguration.java | 119 --------- .../PlatformDotNetPortableConfiguration.java | 228 ----------------- ...PlatformDotNetPortableTypeConfiguration.java | 248 ------------------- .../PlatformDotNetConfigurationClosure.java | 1 - .../dotnet/PlatformDotNetConfigurationEx.java | 1 - .../Config/Compute/compute-standalone.xml | 8 +- .../Config/cache-portables.xml | 4 +- .../Config/cache-query.xml | 4 +- .../native-client-test-cache-affinity.xml | 6 +- 13 files changed, 609 insertions(+), 611 deletions(-) ----------------------------------------------------------------------
