You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2021/02/19 08:48:50 UTC
[incubator-nlpcraft] 01/02: Merge branch 'master' into NLPCRAFT-91
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-91
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 89524b7218d3c602f7f06735949016f49a2174cd
Merge: a30d7ef d8b9213
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Fri Feb 19 11:48:01 2021 +0300
Merge branch 'master' into NLPCRAFT-91
# Conflicts:
# nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
.../probe/mgrs/deploy/NCDeployManager.scala | 28 ++++++++++++++++++++--
.../server/sugsyn/NCSuggestSynonymManager.scala | 4 +++-
2 files changed, 29 insertions(+), 3 deletions(-)
diff --cc nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
index ec250c2,8d18804..9000b8d
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
@@@ -17,9 -17,8 +17,9 @@@
package org.apache.nlpcraft.probe.mgrs.deploy
+import io.opencensus.trace.Span
import java.io._
- import java.lang.reflect.{InvocationTargetException, Method, ParameterizedType, Type}
+ import java.lang.reflect.{InvocationTargetException, Method, ParameterizedType, Type, WildcardType}
import java.util
import java.util.function.Function
import java.util.jar.JarInputStream