Merge remote-tracking branch 'origin/ignite-656' into ignite-656
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f5c5cc9d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f5c5cc9d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f5c5cc9d Branch: refs/heads/ignite-gg-9830 Commit: f5c5cc9d89ee201ecf430625f87512fb5d1781c1 Parents: ce41de7 924580e Author: sboikov <sboi...@gridgain.com> Authored: Wed Apr 22 16:57:18 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Apr 22 16:57:18 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 6 +- .../cache/distributed/dht/GridDhtGetFuture.java | 6 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 5 +- .../dht/colocated/GridDhtColocatedCache.java | 7 +- .../near/GridNearTransactionalCache.java | 11 ++-- .../transactions/IgniteTxLocalAdapter.java | 69 +++++++++++++------- .../cache/transactions/IgniteTxLocalEx.java | 4 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 + 8 files changed, 70 insertions(+), 40 deletions(-) ----------------------------------------------------------------------
