This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-10562 in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit e33ed4e3d08c25b47337e8835011a39fb436dc23 Merge: cbd2ffd fd66964 Author: Dmitriy Pavlov <[email protected]> AuthorDate: Thu Dec 6 17:29:08 2018 +0300 Merge branch 'master' into ignite-10562 # Conflicts: # ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/ProactiveFatBuildSync.java .../ignite/ci/tcmodel/result/tests/TestRef.java | 2 +- .../ci/teamcity/ignited/fatbuild/FatBuildDao.java | 4 ++-- .../ignited/fatbuild/ProactiveFatBuildSync.java | 19 +++++++++++++++++-- .../ci/teamcity/ignited/fatbuild/TestCompacted.java | 4 ++-- .../ignite/ci/web/model/current/TestFailure.java | 4 +++- .../ignite/ci/tcbot/chain/PrChainsProcessorTest.java | 2 +- 6 files changed, 26 insertions(+), 9 deletions(-)
