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

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

commit ec2d07405c8f96a817762b5ec147b0932b4a5976
Merge: baf2cde 4ddfba1
Author: Dmitriy Pavlov <dpav...@apache.org>
AuthorDate: Fri Sep 14 21:00:29 2018 +0300

    Merge branch 'master' into performance
    
    # Conflicts:
    #   ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java

 .../main/java/org/apache/ignite/ci/ITcHelper.java  |  10 ++
 .../main/java/org/apache/ignite/ci/ITeamcity.java  |   4 +-
 .../apache/ignite/ci/IgnitePersistentTeamcity.java |   4 +-
 .../org/apache/ignite/ci/IgniteTeamcityHelper.java |   3 +-
 .../main/java/org/apache/ignite/ci/TcHelper.java   | 179 +++++++++++++++++++++
 .../org/apache/ignite/ci/observer/BuildInfo.java   |  12 +-
 .../apache/ignite/ci/observer/ObserverTask.java    | 156 +-----------------
 .../apache/ignite/ci/web/rest/TriggerBuild.java    | 133 ++++++++++++---
 ignite-tc-helper-web/src/main/webapp/index.html    |  51 ------
 .../src/main/webapp/js/common-1.6.js               |   1 +
 .../src/main/webapp/js/testfails-2.1.js            |  40 ++++-
 ignite-tc-helper-web/src/main/webapp/services.html | 152 +++++++++++++++++
 12 files changed, 508 insertions(+), 237 deletions(-)

diff --cc ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
index 2c54449,de0e7ea..7ba2471
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
@@@ -20,12 -20,12 +20,15 @@@ package org.apache.ignite.ci
  import com.google.common.base.Strings;
  import com.google.common.cache.Cache;
  import com.google.common.cache.CacheBuilder;
+ import java.util.ArrayList;
+ import java.util.LinkedHashMap;
  import java.util.List;
+ import java.util.Map;
 +
 +import com.google.inject.Injector;
  import org.apache.ignite.Ignite;
  import org.apache.ignite.ci.conf.BranchesTracked;
 +import org.apache.ignite.ci.di.IServerProv;
  import org.apache.ignite.ci.observer.BuildObserver;
  import org.apache.ignite.ci.issue.IssueDetector;
  import org.apache.ignite.ci.issue.IssuesStorage;

Reply via email to