You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@linkis.apache.org by ca...@apache.org on 2022/04/02 08:08:10 UTC

[incubator-linkis] 01/01: Merge pull request #1876 from apache/master

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

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

commit 06cf78c6d0d65a33e0c3e2352787d3ef4e8a5cff
Merge: e844d1f 85dca85
Author: Casion <ca...@gmail.com>
AuthorDate: Sat Apr 2 16:08:05 2022 +0800

    Merge pull request #1876 from apache/master
    
    merge branch master to dev-1.1.3

 .github/workflows/build.yml                               |  3 +++
 .github/workflows/check_third_party_dependencies.yml      |  3 +++
 .../assembly-combined/sbin/ext/linkis-ps-publicservice    |  2 +-
 .../src/main/scala/org/apache/linkis/rpc/Sender.scala     | 10 ++++++----
 .../org/apache/linkis/rpc/conf/RPCConfiguration.scala     |  2 +-
 .../main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala | 15 ++++++++++++++-
 .../src/main/assembly/distribution.xml                    |  2 --
 .../src/main/assembly/distribution.xml                    |  1 -
 .../linkis-cs-server/src/main/assembly/distribution.xml   |  1 -
 9 files changed, 28 insertions(+), 11 deletions(-)

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