Merge branch 'ignite-2.1.3' of https://github.com/gridgain/apache-ignite into ignite-5757
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/db161a6b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/db161a6b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/db161a6b Branch: refs/heads/ignite-5757 Commit: db161a6b2a0235ff519e25628cf37895a4a60b1a Parents: b4fe30c 0d6b730 Author: Alexey Goncharuk <[email protected]> Authored: Mon Jul 17 14:28:58 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Jul 17 14:28:58 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 8 ++ .../org/apache/ignite/cache/CacheManager.java | 10 ++ .../apache/ignite/internal/IgniteKernal.java | 71 ++++++----- .../org/apache/ignite/internal/IgnitionEx.java | 10 +- .../client/router/impl/GridTcpRouterImpl.java | 57 ++++++--- .../communication/GridIoMessageFactory.java | 2 +- .../MetaPageUpdatePartitionDataRecord.java | 2 + .../processors/cache/GridCacheProcessor.java | 11 +- .../GridCacheDatabaseSharedManager.java | 28 +++-- .../persistence/GridCacheOffheapManager.java | 2 +- .../IgniteCacheDatabaseSharedManager.java | 44 ++++--- .../ignite/internal/util/IgniteUtils.java | 23 +++- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 10 +- .../GridCacheAbstractNodeRestartSelfTest.java | 2 +- ...titionEvictionDuringReadThroughSelfTest.java | 1 + .../GridCacheReplicatedNodeRestartSelfTest.java | 2 +- .../testsuites/IgniteUtilSelfTestSuite.java | 2 + .../util/mbeans/GridMBeanDisableSelfTest.java | 121 +++++++++++++++++++ .../cache/IgnitePutTxLoadBenchmark.java | 3 +- 19 files changed, 320 insertions(+), 89 deletions(-) ----------------------------------------------------------------------
