You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2018/09/19 17:43:07 UTC
[ignite-teamcity-bot] 01/01: Merge branch 'master' into
incremental-build-upload
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch incremental-build-upload
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit 08d53aa7b19c3a4e9f2e86af662883be00df48d5
Merge: 4ac2525 c5dc307
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Wed Sep 19 20:42:56 2018 +0300
Merge branch 'master' into incremental-build-upload
# Conflicts:
# ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/BuildChainProcessor.java
# ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
# ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssueDetector.java
# ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/util/ExceptionUtil.java
# ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/pr/GetPrTestFailures.java
.../java/org/apache/ignite/ci/BuildChainProcessor.java | 14 +++++---------
.../src/main/java/org/apache/ignite/ci/TcHelper.java | 4 ++--
.../main/java/org/apache/ignite/ci/util/ExceptionUtil.java | 2 +-
.../apache/ignite/ci/web/rest/pr/GetPrTestFailures.java | 2 +-
4 files changed, 9 insertions(+), 13 deletions(-)