diff options
| author | Olli Virtanen <ovirtanen@gmail.com> | 2018-06-25 08:45:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-25 08:45:21 +0200 |
| commit | 48545657cd6bbdd2bf6a4b4398ba2c42c57c522f (patch) | |
| tree | 3b49227570236a52f095f9837a47b2f8cdf80c08 /config-model | |
| parent | 34d80f9d3ffb3ebf984e67d2414f5ab16d2dfa5e (diff) | |
| parent | 79936b19801b09a0f6c98fcdd271bdcd316d7b1c (diff) | |
Merge pull request #6258 from vespa-engine/ovirtanen/convert-scala-to-java-in-container-di
Scala code in container-di converted to Java
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilder.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilder.java index 40a2f2ee144..e8da0b1b662 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/chains/search/DomFederationSearcherBuilder.java @@ -15,7 +15,6 @@ import com.yahoo.vespa.model.container.component.Component; import com.yahoo.vespa.model.container.search.searchchain.FederationSearcher; import com.yahoo.vespa.model.container.search.searchchain.Searcher; import org.w3c.dom.Element; -import scala.Option; import java.util.ArrayList; import java.util.List; |