You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/03/04 10:27:21 UTC
[2/2] ignite git commit: Merge branch 'master' into
ignite-atomic-good-lock-bench
Merge branch 'master' into ignite-atomic-good-lock-bench
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/862a97dc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/862a97dc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/862a97dc
Branch: refs/heads/ignite-atomic-good-lock-bench
Commit: 862a97dcad7b479a7b8621001b90ac5fba38273b
Parents: 0d0c40e ee817dd
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Mar 4 12:26:53 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Mar 4 12:26:53 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------