You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/18 10:37:39 UTC
[43/50] [abbrv] ignite git commit: Merge branch 'ignite-1.8.5-p1'
Merge branch 'ignite-1.8.5-p1'
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java
# modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
# modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
# modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3d0b83d8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3d0b83d8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3d0b83d8
Branch: refs/heads/ignite-4986
Commit: 3d0b83d8dc37faf3f2f7963a9e1cf7380e11150a
Parents: 227599f cd0b929
Author: dkarachentsev <dk...@gridgain.com>
Authored: Tue Apr 18 12:53:05 2017 +0300
Committer: dkarachentsev <dk...@gridgain.com>
Committed: Tue Apr 18 12:53:05 2017 +0300
----------------------------------------------------------------------
modules/core/pom.xml | 3 ++
.../IgniteCacheExpiryPolicyAbstractTest.java | 44 ++++++++++++++++++++
2 files changed, 47 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d0b83d8/modules/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d0b83d8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------