Merge remote-tracking branch 'community/ignite-gg-8.0.2.ea2' into ignite-gg-8.0.2.ea2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c31bc1a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c31bc1a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c31bc1a Branch: refs/heads/ignite-3477 Commit: 6c31bc1a59b56de5328af3d9c160e35dd7e52c34 Parents: 8f69186 6e5bfea Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Mon Jan 16 21:10:08 2017 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Mon Jan 16 21:10:08 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 3 ++- .../cache/DynamicCacheChangeRequest.java | 8 +++--- .../processors/cache/GridCacheProcessor.java | 9 ++++--- .../ignite/spi/discovery/tcp/ServerImpl.java | 1 - .../cache/GridCacheAbstractMetricsSelfTest.java | 8 +++++- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 3 +++ ...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 10 ++++++++ .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../query/h2/database/H2TreeIndex.java | 2 +- .../query/h2/opt/GridH2TreeIndex.java | 26 ++++++++++++-------- .../query/h2/opt/GridH2TableSelfTest.java | 8 +++++- 11 files changed, 56 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c31bc1a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c31bc1a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java ----------------------------------------------------------------------