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/7079c18a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7079c18a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7079c18a Branch: refs/heads/ignite-1232 Commit: 7079c18a6950dcbb6c9ff54c70caddfbc2090f8b Parents: ac266a7 abd1c74 Author: Denis Magda <[email protected]> Authored: Wed Jul 20 13:31:47 2016 +0300 Committer: Denis Magda <[email protected]> Committed: Wed Jul 20 13:31:47 2016 +0300 ---------------------------------------------------------------------- assembly/LICENSE_FABRIC | 7 +- assembly/LICENSE_HADOOP | 7 +- examples/pom-standalone-lgpl.xml | 6 +- examples/pom-standalone.xml | 6 +- examples/pom.xml | 6 +- examples/schema-import/pom-standalone.xml | 6 +- examples/schema-import/pom.xml | 6 +- modules/cassandra/pom.xml | 2 +- modules/core/pom.xml | 6 +- .../ignite/cache/query/ContinuousQuery.java | 47 +++++-- .../processors/cache/IgniteCacheProxy.java | 3 +- .../continuous/CacheContinuousQueryManager.java | 9 +- .../PlatformAffinityFunctionTarget.java | 8 +- .../cache/affinity/PlatformAffinityUtils.java | 5 + ...ridCacheContinuousQueryAbstractSelfTest.java | 47 +++++++ modules/flume/README.txt | 2 +- modules/kafka/README.txt | 4 +- .../platforms/cpp/jni/include/ignite/jni/java.h | 8 +- modules/platforms/cpp/jni/src/java.cpp | 20 +-- .../Apache.Ignite.Core.Tests.csproj | 3 + .../Affinity/AffinityFunctionSpringTest.cs | 104 +++++++------- .../Cache/CacheConfigurationTest.cs | 1 + .../Config/Cache/Affinity/affinity-function.xml | 2 +- .../Cache/Affinity/affinity-function2.xml | 49 +++++++ .../Apache.Ignite.Core.Tests/DeploymentTest.cs | 2 +- .../Apache.Ignite.Core.Tests/TestRunner.cs | 2 +- .../Apache.Ignite.Core.csproj | 13 +- .../Cache/Affinity/Fair/FairAffinityFunction.cs | 1 + .../Cache/Affinity/Fair/Package-Info.cs | 26 ++++ .../Cache/Affinity/Package-Info.cs | 26 ++++ .../Cache/Affinity/Rendezvous/Package-Info.cs | 26 ++++ .../Rendezvous/RendezvousAffinityFunction.cs | 1 + .../Cache/Configuration/Package-Info.cs | 26 ++++ .../Cache/Eviction/Package-Info.cs | 26 ++++ .../Communication/Package-Info.cs | 26 ++++ .../Communication/Tcp/Package-Info.cs | 26 ++++ .../dotnet/Apache.Ignite.Core/Ignition.cs | 2 +- .../Impl/Binary/BinaryReaderExtensions.cs | 2 +- .../Impl/Cache/Affinity/AffinityFunctionBase.cs | 140 +++++++++++++++++++ .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 2 +- .../Impl/Unmanaged/UnmanagedCallbacks.cs | 11 +- parent/pom.xml | 1 + 42 files changed, 601 insertions(+), 122 deletions(-) ----------------------------------------------------------------------
