You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/19 17:00:42 UTC
[6/8] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-5' into ignite-23
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-23
Conflicts:
modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6f5f15c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6f5f15c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6f5f15c
Branch: refs/heads/ignite-23
Commit: d6f5f15c6f73dd0a643c9ef98a42f5db4b36771b
Parents: a2a6f31 ba7fddb
Author: sboikov <sb...@gridgain.com>
Authored: Tue May 19 09:06:02 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue May 19 09:06:02 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/managers/communication/GridIoManager.java | 6 +++---
.../communication/GridLifecycleAwareMessageFilter.java | 5 ++++-
.../org/apache/ignite/testsuites/IgniteCacheTestSuite2.java | 1 +
3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d6f5f15c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
----------------------------------------------------------------------