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/12 07:11:29 UTC
[incubator-linkis] 01/01: Merge pull request #2102 from apache/master
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit e0c9310f5ec91a6f23863366638b8666f5c4a419
Merge: f4614b5ad ec962901e
Author: peacewong <wp...@gmail.com>
AuthorDate: Thu May 12 15:11:22 2022 +0800
Merge pull request #2102 from apache/master
merge master into dev-1.1.2
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