IGNITE-80 - Merge branch 'ignite-80-1' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5de74fe6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5de74fe6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5de74fe6 Branch: refs/heads/ignite-843 Commit: 5de74fe6d7f3837310cfd9f4f9e5d2636560e182 Parents: 81ce0e6 dcda61b Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Wed Apr 29 22:49:14 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Wed Apr 29 22:49:14 2015 -0700 ---------------------------------------------------------------------- .../processors/cache/GridCacheIoManager.java | 5 +-- .../GridCachePartitionExchangeManager.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java | 6 ++- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 42 +++++++++++++++----- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 ++++++++++++++--- .../colocated/GridDhtColocatedLockFuture.java | 4 +- .../cache/transactions/IgniteTxManager.java | 24 +++++++++++ 8 files changed, 101 insertions(+), 24 deletions(-) ----------------------------------------------------------------------
