You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/02/03 14:47:18 UTC
[6/6] ignite git commit: Merge branch 'ignite-db-x' of
https://github.com/gridgain/apache-ignite into ignite-db-x
Merge branch 'ignite-db-x' of https://github.com/gridgain/apache-ignite into ignite-db-x
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f86c05b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f86c05b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f86c05b
Branch: refs/heads/ignite-3477
Commit: 1f86c05be9ed6db1b1ea1b3de021a6c782fab0be
Parents: bac9b69 1124723
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Feb 3 17:46:41 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Feb 3 17:46:41 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 ----------
.../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 +++
20 files changed, 160 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1f86c05b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------