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-843 Commit: 51a9bd85e5cb7cb38fcc60b7adf808fe0545e7df Parents: 4f8f32a 36f7ba6 Author: Denis Magda <dma...@gridgain.com> Authored: Thu Aug 13 09:12:26 2015 +0300 Committer: Denis Magda <dma...@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(-) ----------------------------------------------------------------------
