Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Conflicts: modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/42250723 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/42250723 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/42250723 Branch: refs/heads/ignite-1537 Commit: 4225072339a031549673b71a43d9fb220c4849fc Parents: bafaaf5 3d9be34 Author: sboikov <sboi...@gridgain.com> Authored: Mon Dec 14 14:13:17 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Dec 14 14:13:17 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 26 ++- .../ignite/internal/binary/BinaryUtils.java | 19 +- .../dht/GridPartitionedSingleGetFuture.java | 14 +- .../resources/META-INF/classnames.properties | 68 ++++--- .../binary/BinaryMarshallerSelfTest.java | 42 ----- .../binary/BinaryObjectBuilderSelfTest.java | 10 +- .../binary/GridBinaryWildcardsSelfTest.java | 16 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 25 ++- .../GridCacheAbstractNodeRestartSelfTest.java | 25 ++- ...ContinuousQueryFailoverAbstractSelfTest.java | 186 ++++++++++--------- .../tcp/TcpClientDiscoverySpiMulticastTest.java | 10 +- .../query/IgniteSqlSplitterSelfTest.java | 4 +- .../cpp/core/include/ignite/ignition.h | 41 +--- .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 8 + .../ignite/internal/GridFactorySelfTest.java | 16 ++ 15 files changed, 265 insertions(+), 245 deletions(-) ----------------------------------------------------------------------