You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/01/16 08:43:24 UTC
[6/6] ignite git commit: Merge remote-tracking branch
'remotes/community/ignite-gg-8.0.2.ea2' into ignite-gg-11810
Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into ignite-gg-11810
# Conflicts:
# modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e81cfdbe
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e81cfdbe
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e81cfdbe
Branch: refs/heads/ignite-gg-11810
Commit: e81cfdbefd89502ac239fcccb8bd0a8037e52290
Parents: fc9c488 e1b84b4
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jan 16 11:43:17 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jan 16 11:43:17 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 3 +--
.../main/resources/META-INF/classnames.properties | 2 --
.../internal/ClusterNodeMetricsSelfTest.java | 2 ++
.../GridDeploymentMessageCountSelfTest.java | 3 +++
.../processors/cache/ClusterStateAbstractTest.java | 3 ++-
.../IgniteCacheExpiryPolicyAbstractTest.java | 6 ++----
.../testsuites/IgniteComputeGridTestSuite.java | 1 -
.../main/resources/META-INF/classnames.properties | 16 +---------------
.../processors/query/h2/database/H2TreeIndex.java | 2 +-
.../query/IgniteSqlSplitterSelfTest.java | 2 +-
.../testsuites/IgniteDistributedJoinTestSuite.java | 17 +++++++++++++++++
12 files changed, 31 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e81cfdbe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e81cfdbe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e81cfdbe/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e81cfdbe/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
----------------------------------------------------------------------