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/02/04 09:18:33 UTC

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

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


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

Branch: refs/heads/ignite-2407
Commit: 18efa6a8fe6cbb9bb392df0258afb225480e64ac
Parents: 78a42a5 afd3bc1
Author: sboikov <sb...@gridgain.com>
Authored: Thu Feb 4 11:17:19 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Feb 4 11:17:19 2016 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheMapEntry.java     |  4 +--
 .../cache/GridCacheUpdateAtomicResult.java      |  4 +--
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |  2 +-
 .../ignite/internal/util/nio/GridNioServer.java | 28 ++------------------
 .../ignite/internal/GridFactorySelfTest.java    |  2 +-
 5 files changed, 8 insertions(+), 32 deletions(-)
----------------------------------------------------------------------