You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/06/24 02:48:32 UTC

[dolphinscheduler] branch json_split_two updated (85f3ab4 -> fc203fb)

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

kirs pushed a change to branch json_split_two
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git.


    from 85f3ab4  [Feature][JsonSplit-api] define task api (#5647)
     add 87604b7  [Fix-5581][SQL] Specific key was too long, max key length is 767 bytes for varchar(256) in some mysql with innodb_large_prefix=OFF (#5582)
     add 75be097  [DS-5559][fix][Master Server] Master Server was shutdown but the process still in system (#5588)
     add 281b5ae  [Fix-5468][Common] Fix obtaining IP is incorrect (#5594)
     add 697f37d  [Fix-5583][sql] fix table name error in sql upgrade script (#5606)
     add e2243d6  [Feature-#3961][Registry]Registry-SPI (#5562)
     add 79eb2e8  [Improvement-5539][Master] Check status of taskInstance from cache (#5572)
     add 0d303a8  [Fix][Docker] Fix docker image build error (#5613)
     add d70fdf2  modify issues translation robot (#5614)
     add 5d3b75a  [Improvement-5567][UI] Add project id in web ui url for sharing and project name in project page (#5568)
     add b436ef0  modify issues translation robot (#5624)
     add 8bf042a  [Fix-5596][Python] Fix conflict between python_home and datax_home configuration in dolphinscheduler_env.sh (#5612)
     add 0d5037e  [Fix-5483] [Bug][API] Can't view variables in the page of Process Instance (#5631)
     add c5bea3c  [Fix-5540][JSON Split] Fix some new tables and fields are missing in the sql upgrade script (#5611)
     add 9d70c7e  Update ProcessDefinitionMapperTest.java (#5633)
     add e2d6265  [Improvement][registry-plugin] Optimize registry plugin loading and initial installation #5635
     add 6771144  [Improvement][SQL] Query return number In SQL should be configurable (#5632)
     add 0a5670f  Fix the bug `Edit User Info will always shows failed.` (#5627)
     add 015ed7f  [Bug Fix] Edit the note of existed datasource does't work. (#5642)
     add 86ffc1f  [Bug][WorkerServer] SqlTask NullPointerException (#5556)
     add b05957d  [Improvement] The newly introduced spi pugin support work in windows os
     add 3026f04  [Improvement-5452][Task] ds flink task support submit a PyFlink job via the CLI (#5453)
     add 0d7c32a  Update TaskInstanceCacheManagerImpl.java (#5656)
     add b21e821  fix PSQLException: ERROR: operator does not exist. (#5654)
     add 75813e7  [bug fix] Some password attributes can be viewd directly in the log (#5638)
     add a768214  [Feature-#5565][UI] Global Param passed by sense dependencies (#5628)
     add f7e5512  docker-compose wrong env (#5664)
     add e2eed1f  [Improvement] Fix a potential problem when editing an existing mysql data source
     add e628e4e  [Improvement][API] Simplify the Check of Result by introducing several new methods. (#5666)
     add d64e3cb  add the pageSize parameter (#5663)
     add 60f93d1  update maven repository url (#5674)
     add 8ebd646  update submodule translate-on-issue (#5677)
     add 664206c  wrong word: 'WAITTING' ->'WAITING' (#5682)
     add 93f1d4d  [Improvement-5405][Docker/K8s] Adapt to registry SPI (#5681)
     new fc203fb  Merge remote-tracking branch 'origin/dev' into json_split_two

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../conf/dolphinscheduler/registry.properties.tpl  |  8 ++-
 docker/build/startup-init-conf.sh                  |  2 +-
 docker/docker-swarm/config.env.sh                  |  5 +-
 .../dolphinscheduler/templates/_helpers.tpl        | 24 ++++---
 .../apache/dolphinscheduler/api/utils/Result.java  | 25 ++++++--
 .../ProcessDefinitionControllerTest.java           | 74 +++++++++++-----------
 .../service/registry/RegistryCenter.java           |  5 +-
 .../src/main/resources/registry.properties         | 16 ++---
 8 files changed, 87 insertions(+), 72 deletions(-)

[dolphinscheduler] 01/01: Merge remote-tracking branch 'origin/dev' into json_split_two

Posted by ki...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

kirs pushed a commit to branch json_split_two
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git

commit fc203fb41cafdf7336216804d2b2543562ad5a22
Merge: 85f3ab4 93f1d4d
Author: CalvinKirs <ki...@apache.org>
AuthorDate: Thu Jun 24 10:48:11 2021 +0800

    Merge remote-tracking branch 'origin/dev' into json_split_two
    
    # Conflicts:
    #	.github/actions/translate-on-issue
    #	docker/build/conf/dolphinscheduler/registry.properties.tpl
    #	docker/build/startup-init-conf.sh
    #	docker/docker-swarm/config.env.sh
    #	docker/kubernetes/dolphinscheduler/templates/_helpers.tpl
    #	dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
    #	dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/registry/RegistryCenter.java
    #	dolphinscheduler-service/src/main/resources/registry.properties

 .../conf/dolphinscheduler/registry.properties.tpl  |  8 ++-
 docker/build/startup-init-conf.sh                  |  2 +-
 docker/docker-swarm/config.env.sh                  |  5 +-
 .../dolphinscheduler/templates/_helpers.tpl        | 24 ++++---
 .../apache/dolphinscheduler/api/utils/Result.java  | 25 ++++++--
 .../ProcessDefinitionControllerTest.java           | 74 +++++++++++-----------
 .../service/registry/RegistryCenter.java           |  5 +-
 .../src/main/resources/registry.properties         | 16 ++---
 8 files changed, 87 insertions(+), 72 deletions(-)