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 2016/06/27 09:37:48 UTC

[06/10] ignite git commit: Merge remote-tracking branch 'upstream/gridgain-7.5.27' into gridgain-7.5.27

Merge remote-tracking branch 'upstream/gridgain-7.5.27' into gridgain-7.5.27


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c0120b9f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c0120b9f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c0120b9f

Branch: refs/heads/ignite-3361
Commit: c0120b9f2f4632014437f4338b378bea80c4d3d6
Parents: c1000b1 b634a68
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Jun 22 16:44:49 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Jun 22 16:44:49 2016 +0300

----------------------------------------------------------------------
 .../distributed/near/GridNearGetFuture.java     |   8 +-
 .../transactions/IgniteTxLocalAdapter.java      |  12 +-
 .../cache/transactions/IgniteTxManager.java     |  16 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |   2 +-
 .../IgniteCacheTxIteratorSelfTest.java          | 241 +++++++++++++++++++
 .../vm/TcpDiscoveryVmIpFinderSelfTest.java      |  75 ++++++
 .../testsuites/IgniteCacheTestSuite5.java       |   2 +
 7 files changed, 342 insertions(+), 14 deletions(-)
----------------------------------------------------------------------