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/08/13 08:13:11 UTC

[4/4] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-946

Merge remote-tracking branch 'remotes/origin/master' into ignite-946


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

Branch: refs/heads/ignite-946
Commit: 51a9bd85e5cb7cb38fcc60b7adf808fe0545e7df
Parents: 4f8f32a 36f7ba6
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu Aug 13 09:12:26 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu Aug 13 09:12:26 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheGateway.java      |  5 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    | 91 +++++++++++++-------
 2 files changed, 62 insertions(+), 34 deletions(-)
----------------------------------------------------------------------