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/07/24 13:23:28 UTC

[incubator-linkis] 01/01: Merge pull request #2509 from apache/dev-1.1.3

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 dbb9eacd3c0542571883005d0f28553d2c9f66fb
Merge: 5c7330536 e7b10f7f3
Author: peacewong <wp...@gmail.com>
AuthorDate: Sun Jul 24 21:23:22 2022 +0800

    Merge pull request #2509 from apache/dev-1.1.3
    
    Merge dev-1.1.3 into master

 .../assembly-combined/conf/application-eureka.yml  |  8 ++++++++
 .../assembly-combined/conf/application-linkis.yml  |  6 +++++-
 .../assembly-combined/conf/linkis.properties       |  9 +++++++++
 .../assembly-combined/sbin/common.sh               | 12 ++++++++++--
 .../assembly-combined/sbin/linkis-start-all.sh     |  2 +-
 assembly-combined-package/bin/install.sh           | 22 ++++++++++------------
 6 files changed, 43 insertions(+), 16 deletions(-)


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