You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2017/03/21 11:41:33 UTC
[10/12] ignite git commit: Merge ignite-1.7.8 into ignite-1.8.4
Merge ignite-1.7.8 into ignite-1.8.4
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/22632839
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/22632839
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/22632839
Branch: refs/heads/master
Commit: 22632839bd59123167ed96255d6fbcd9c04f45a9
Parents: 6633da6 c0e2df2
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Wed Mar 15 13:47:55 2017 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Wed Mar 15 13:47:55 2017 +0300
----------------------------------------------------------------------
.../internal/managers/GridManagerAdapter.java | 4 +
.../distributed/dht/GridDhtCacheAdapter.java | 19 +-
.../cache/query/GridCacheQueryManager.java | 97 +++++-----
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 5 +
.../org/apache/ignite/spi/IgniteSpiContext.java | 6 +
.../ignite/spi/discovery/tcp/ClientImpl.java | 32 +++-
.../ignite/spi/discovery/tcp/ServerImpl.java | 19 ++
.../spi/discovery/tcp/TcpDiscoverySpi.java | 5 +
.../tcp/internal/TcpDiscoveryNode.java | 6 +-
...veryNodeAttributesUpdateOnReconnectTest.java | 110 +++++++++++
.../TcpDiscoverySslSecuredUnsecuredTest.java | 185 +++++++++++++++++++
.../tcp/TestReconnectPluginProvider.java | 111 +++++++++++
.../discovery/tcp/TestReconnectProcessor.java | 93 ++++++++++
.../testframework/GridSpiTestContext.java | 5 +
.../IgniteSpiDiscoverySelfTestSuite.java | 5 +
.../org.apache.ignite.plugin.PluginProvider | 1 +
parent/pom.xml | 1 +
17 files changed, 648 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/22632839/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/22632839/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/22632839/parent/pom.xml
----------------------------------------------------------------------