ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [7/9] ignite git commit: Merge branches 'ignite-3477' and 'ignite-4652' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-4652
Date Sun, 05 Feb 2017 19:45:09 GMT
Merge branches 'ignite-3477' and 'ignite-4652' of https://git-wip-us.apache.org/repos/asf/ignite
into ignite-4652


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/49787d70
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49787d70
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49787d70

Branch: refs/heads/ignite-4652
Commit: 49787d7061c6c46b2c21f17d8eb527a81a113013
Parents: 261ddbd 1f86c05
Author: Sergi <sergi.vladykin@gmail.com>
Authored: Fri Feb 3 18:33:39 2017 +0300
Committer: Sergi <sergi.vladykin@gmail.com>
Committed: Fri Feb 3 18:33:39 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(-)
----------------------------------------------------------------------



Mime
View raw message