Merge branch 'ignite-589' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-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/f9f649aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9f649aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9f649aa Branch: refs/heads/ignite-573 Commit: f9f649aae3943bb9034dcdd56c279a3317db6f6b Parents: c29cb27 76e45ac Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Wed Mar 25 18:50:17 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Wed Mar 25 18:50:17 2015 -0700 ---------------------------------------------------------------------- .../processors/cache/GridCacheEntryEx.java | 1 + .../processors/cache/GridCacheMapEntry.java | 11 +++++----- .../GridDistributedTxRemoteAdapter.java | 16 +++++++++----- .../dht/atomic/GridDhtAtomicCache.java | 3 +++ .../distributed/near/GridNearAtomicCache.java | 2 ++ .../distributed/near/GridNearCacheEntry.java | 22 ++++++++++---------- .../distributed/near/GridNearLockFuture.java | 4 ++-- .../near/GridNearTxPrepareFuture.java | 2 +- .../service/GridServiceProcessor.java | 4 ++-- .../processors/cache/GridCacheTestEntryEx.java | 1 + .../ignite/messaging/GridMessagingSelfTest.java | 13 ++++++------ 11 files changed, 47 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
