Merge remote-tracking branch 'remotes/origin/master' into ignite-890
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e402e98e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e402e98e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e402e98e Branch: refs/heads/ignite-884 Commit: e402e98e384f9d1de0d6e64591ecbc1a8464f22c Parents: 86b8545 de7e06f Author: Denis Magda <dma...@gridgain.com> Authored: Wed Jul 15 08:44:53 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed Jul 15 08:44:53 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheTypeMetadata.java | 53 ++++++++++---------- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 20 ++++++-- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- ...acheAtomicReplicatedNodeRestartSelfTest.java | 15 ------ 5 files changed, 45 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
