You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/16 08:37:24 UTC
[14/17] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-901
Merge remote-tracking branch 'remotes/origin/master' into ignite-901
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4d2b1807
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4d2b1807
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4d2b1807
Branch: refs/heads/ignite-901
Commit: 4d2b1807dec94761914cb1e4611a6cd0b6e532ed
Parents: 59cc047 cd3a9b6
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jul 16 08:36:39 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jul 16 08:36:39 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/cache/CacheTypeMetadata.java | 53 ++++++++++----------
.../processors/query/GridQueryProcessor.java | 4 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 12 ++---
...acheAtomicReplicatedNodeRestartSelfTest.java | 5 ++
.../apache/ignite/cache/spring/SpringCache.java | 2 +-
.../ignite/cache/spring/SpringCacheManager.java | 22 ++++----
6 files changed, 54 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4d2b1807/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------