Merge branch 'ignite-784' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-784
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a92ee30f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a92ee30f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a92ee30f Branch: refs/heads/ignite-784 Commit: a92ee30faba576537c9961416b79786c8b8b3d09 Parents: 144ace5 960bd6a Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 23 10:37:23 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 23 10:37:23 2015 +0300 ---------------------------------------------------------------------- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 2 +- .../distributed/near/GridNearGetFuture.java | 21 +++++++++++++------- .../distributed/near/GridNearLockFuture.java | 2 +- .../near/GridNearTransactionalCache.java | 2 +- 5 files changed, 18 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a92ee30f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ----------------------------------------------------------------------
