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 2017/02/06 08:15:52 UTC
[8/8] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-3477' into ignite-3477-putdown
Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-3477-putdown
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/121af5ce
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/121af5ce
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/121af5ce
Branch: refs/heads/ignite-3477-putdown
Commit: 121af5ce5cb366c4db792bcbeea2d5128b46ccfd
Parents: 012d8c5 8d5d686
Author: sboikov <sb...@gridgain.com>
Authored: Mon Feb 6 11:14:35 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Feb 6 11:14:35 2017 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/Ignite.java | 5 ++
.../java/org/apache/ignite/IgniteCache.java | 6 ---
.../apache/ignite/internal/IgniteKernal.java | 15 ++++++
.../processors/cache/GridCacheProcessor.java | 44 ++++++++++++-----
.../processors/cache/IgniteCacheProxy.java | 26 ----------
.../cache/database/freelist/FreeListImpl.java | 5 +-
.../dht/GridDhtPartitionTopologyImpl.java | 2 +-
.../dht/preloader/GridDhtPartitionDemander.java | 1 -
.../GridDhtPartitionsExchangeFuture.java | 41 +++++++++------
.../continuous/CacheContinuousQueryHandler.java | 2 +
.../ignite/internal/util/IgniteUtils.java | 3 ++
.../IgniteCachePartitionLossPolicySelfTest.java | 14 +++---
.../GridCacheRebalancingSyncSelfTest.java | 8 +--
.../continuous/GridEventConsumeSelfTest.java | 3 +-
.../processors/igfs/IgfsIgniteMock.java | 5 ++
.../odbc/OdbcProcessorValidationSelfTest.java | 4 +-
.../ignite/testframework/junits/IgniteMock.java | 5 ++
.../junits/common/GridCommonAbstractTest.java | 52 ++++++++++++++------
.../multijvm/IgniteCacheProcessProxy.java | 5 --
.../junits/multijvm/IgniteProcessProxy.java | 5 ++
.../org/apache/ignite/IgniteSpringBean.java | 7 +++
21 files changed, 164 insertions(+), 94 deletions(-)
----------------------------------------------------------------------