Merge branch 'ignite-2.1.3' of https://github.com/gridgain/apache-ignite into ignite-2.1.3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8f1d732f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f1d732f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f1d732f Branch: refs/heads/ignite-5757 Commit: 8f1d732fc8065e59a29bb538456194d7f4edd3e9 Parents: d5cc82c 9fa7884 Author: Sergey Chugunov <[email protected]> Authored: Fri Jul 14 14:52:17 2017 +0300 Committer: Sergey Chugunov <[email protected]> Committed: Fri Jul 14 14:52:17 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 ++++++--- .../processors/cache/GridCacheProcessor.java | 11 +- .../GridCacheDatabaseSharedManager.java | 28 +++-- .../IgniteCacheDatabaseSharedManager.java | 44 ++++--- .../ignite/internal/util/IgniteUtils.java | 23 +++- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 10 +- .../testsuites/IgniteUtilSelfTestSuite.java | 2 + .../util/mbeans/GridMBeanDisableSelfTest.java | 121 +++++++++++++++++++ 12 files changed, 312 insertions(+), 83 deletions(-) ----------------------------------------------------------------------
