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 2020/04/04 12:20:44 UTC

[incubator-nlpcraft] 01/01: Merge branch 'master' into NLPCRAFT-30

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

sergeykamov pushed a commit to branch NLPCRAFT-30
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git

commit 218e6515bc090111286483edb13ffa7cb6095ba8
Merge: dff470a 8101350
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Sat Apr 4 15:20:18 2020 +0300

    Merge branch 'master' into NLPCRAFT-30

 bin/prepare.sh                                     | 13 +++++++++----
 pom.xml                                            | 18 +++++++++---------
 .../scala/org/apache/nlpcraft/model/NCUser.java    | 22 +++++++++++++++-------
 .../org/apache/nlpcraft/probe/NCProbeBoot.scala    |  8 +++++++-
 .../probe/mgrs/conn/NCConnectionManager.scala      |  6 +++---
 .../probe/mgrs/deploy/NCDeployManager.scala        |  7 ++++---
 .../nlpcraft/probe/mgrs/model/NCModelManager.scala |  3 ++-
 .../probe/mgrs/nlp/NCProbeEnrichmentManager.scala  | 11 +++++++----
 .../server/nlp/core/NCNlpServerManager.scala       |  3 ++-
 .../nlp/core/google/NCGoogleNerEnricher.scala      | 17 +++++++++++++++++
 .../apache/nlpcraft/server/tx/NCTxManager.scala    |  3 ++-
 .../nlpcraft/model/intent/dsl/NCDslTestModel.scala |  2 +-
 12 files changed, 78 insertions(+), 35 deletions(-)