You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/07/16 08:01:45 UTC
[12/13] incubator-ignite git commit: Merge branch 'master' into
ignite-1108
Merge branch 'master' into ignite-1108
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fbbc3032
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fbbc3032
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fbbc3032
Branch: refs/heads/ignite-1108
Commit: fbbc3032e87764ee7128b33d47f6eec14acf2b01
Parents: 03dd16b cd3a9b6
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Jul 16 08:07:56 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Jul 16 08:07:56 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/cache/CacheTypeMetadata.java | 53 ++++++++++----------
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 20 ++++++--
.../processors/query/GridQueryProcessor.java | 4 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 12 ++---
...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +-
...acheAtomicReplicatedNodeRestartSelfTest.java | 14 +-----
.../apache/ignite/cache/spring/SpringCache.java | 2 +-
.../ignite/cache/spring/SpringCacheManager.java | 22 ++++----
9 files changed, 69 insertions(+), 64 deletions(-)
----------------------------------------------------------------------