You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/05/11 06:25:00 UTC

[incubator-linkis] 01/01: Merge pull request #2101 from apache/dev-1.1.1

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

peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git

commit ec962901e0f7d1845184e22c3bf35947f3d94cdb
Merge: 9e336ccbb 24a80da4a
Author: peacewong <wp...@gmail.com>
AuthorDate: Wed May 11 14:24:53 2022 +0800

    Merge pull request #2101 from apache/dev-1.1.1
    
    merge dev-1.1.1 into master

 DISCLAIMER                                         |   6 +
 DISCLAIMER-WIP                                     |  17 --
 LICENSE-binary-ui                                  |   4 +-
 .../deploy-config/linkis-env.sh                    |   4 +-
 db/linkis_ddl.sql                                  |   2 +-
 db/linkis_dml.sql                                  |  25 ++-
 db/upgrade/1.1.1_schema/mysql/linkis_ddl.sql       | 117 ++++++++++++
 db/upgrade/1.1.1_schema/mysql/linkis_dml.sql       | 197 +++++++++++++++++++++
 .../openlookeng/src/main/assembly/distribution.xml |   2 +-
 .../executor/OpenLooKengEngineConnExecutor.java    |   3 +-
 .../{log4j2-engineconn.xml => log4j2.xml}          |   0
 .../scala/org/apache/linkis/udf/UDFClient.scala    |  12 +-
 .../org/apache/linkis/udf/entity/UDFVersion.java   |  17 ++
 pom.xml                                            |   2 +-
 web/vue.config.js                                  |   2 +-
 15 files changed, 377 insertions(+), 33 deletions(-)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org