Merge remote-tracking branch 'origin/ignite-683-2' into ignite-683-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/981b7b11 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/981b7b11 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/981b7b11 Branch: refs/heads/ignite-218 Commit: 981b7b11c907535f6fa38df7cda5c1a0d84c9422 Parents: 5f81edb 8113edd Author: sboikov <sboi...@gridgain.com> Authored: Mon Apr 13 14:10:29 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Apr 13 14:10:29 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 115 +++++-------------- .../dht/atomic/GridDhtAtomicCache.java | 14 +-- .../distributed/near/GridNearAtomicCache.java | 13 +-- .../distributed/near/GridNearCacheAdapter.java | 11 +- .../local/atomic/GridLocalAtomicCache.java | 14 +-- .../GridAtomicCacheQueueImpl.java | 2 +- .../GridTransactionalCacheQueueImpl.java | 2 +- 7 files changed, 54 insertions(+), 117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/981b7b11/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
