You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/02/21 16:29:53 UTC
[3/4] ignite git commit: Merge branch 'ignite-db-x' of
https://github.com/gridgain/apache-ignite into ignite-db-x
Merge branch 'ignite-db-x' of https://github.com/gridgain/apache-ignite into ignite-db-x
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/885436cc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/885436cc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/885436cc
Branch: refs/heads/ignite-3477
Commit: 885436cc4a7a8e9e1b159ca833268f98d752ef0c
Parents: 7721df2 946e71c
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Feb 21 19:06:47 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Feb 21 19:06:47 2017 +0300
----------------------------------------------------------------------
.../managers/discovery/GridDiscoveryManager.java | 11 +++++++++++
.../cache/query/GridCacheDistributedQueryFuture.java | 5 ++---
.../discovery/tcp/internal/TcpDiscoveryNodesRing.java | 3 ++-
.../IgniteDynamicCacheStartNoExchangeTimeoutTest.java | 8 +++++---
.../junits/common/GridCommonAbstractTest.java | 2 +-
5 files changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------