ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [02/38] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-23
Date Wed, 27 May 2015 14:48:53 GMT
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-709_2
Commit: d6f5f15c6f73dd0a643c9ef98a42f5db4b36771b
Parents: a2a6f31 ba7fddb
Author: sboikov <sboikov@gridgain.com>
Authored: Tue May 19 09:06:02 2015 +0300
Committer: sboikov <sboikov@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
----------------------------------------------------------------------


Mime
View raw message