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/06/02 12:46:49 UTC
[14/50] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-709_2' into ignite-943
Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-943
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3dea5f14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3dea5f14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3dea5f14
Branch: refs/heads/ignite-960
Commit: 3dea5f148e3fc017bf9643e69f2661a132cfc96c
Parents: 110573b 581f4d9
Author: sevdokimov <se...@gridgain.com>
Authored: Thu May 28 17:19:27 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu May 28 17:19:27 2015 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 1 -
.../processors/cache/GridCacheAdapter.java | 15 ++++++++-
.../cache/GridCacheConcurrentMap.java | 21 ++++++++++---
.../processors/cache/GridCacheProcessor.java | 32 +++++++++++---------
.../processors/cache/GridCacheProxyImpl.java | 12 ++++++++
.../processors/cache/IgniteInternalCache.java | 5 +++
.../cache/query/GridCacheQueryAdapter.java | 2 ++
.../cache/query/GridCacheQueryErrorFuture.java | 2 ++
.../cache/query/GridCacheQueryManager.java | 2 +-
.../continuous/CacheContinuousQueryManager.java | 24 ++++++++++++---
.../cacheobject/IgniteCacheObjectProcessor.java | 5 ++-
.../IgniteCacheObjectProcessorImpl.java | 2 +-
12 files changed, 93 insertions(+), 30 deletions(-)
----------------------------------------------------------------------