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/11/22 15:17:39 UTC

[ignite-teamcity-bot] 01/01: Merge branch 'master' into ignite-10372

This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a commit to branch ignite-10372
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git

commit 4254fdae58096b9ac42404347871599ea529d7d5
Merge: 84fd1f5 1b34a37
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Thu Nov 22 18:17:27 2018 +0300

    Merge branch 'master' into ignite-10372
    
    # Conflicts:
    #	ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java

 .../src/main/java/org/apache/ignite/ci/web/model/Version.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)