5 Commits

Author	SHA1	Message	Date
lenboo	f05ba84968	Merge remote-tracking branch 'upstream/dev' into spilit ... # Conflicts: # dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java # dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java	2021-03-25 23:54:01 +08:00
Shiwen Cheng	0d065c0712	[Feature-5062][*] Create/Edit/Delete Worker Group in Web UI (#5113) ... * [Improvement][Server] Rename MASTER_PREFIX to MASTER_TYPE and WORKER_PREFIX to WORKER_TYPE * [Feature][Api&Dao] Support api and dao of worker group * [Feature][UI] Support to create, edit and delete worker group * [Feature][API&UI] Support work groups from database and zookeeper to display together in worker group management * [Feature][API&Dao] Support long ip list and check request parameters when saving worker group * [Feature][*] Refactor ipList to addrList * [Feature][Server] Support host manager to select worker host by worker group in database * [Improvement][Server] Improve the config of master and worker * [Improvement][*] Rename zkRegistered to systemDefault * [Improvement][Test] Fix unit test and improve ui * [Improvement][Server] Improve getServerMaps Co-authored-by: dailidong <dailidong66@gmail.com>	2021-03-23 23:47:41 +08:00
Kirs	f109a758f8	[Bug][PGSQL] Delete the stopped workflow without deleting the correspon… (#5066) ... * [Bug][Api] Delete the stopped workflow without deleting the corresponding sub process, the workflow instance name is not displayed in the sub process * fix ut * fix ut err * sql style * fix error	2021-03-23 11:26:11 +08:00
lenboo	ccc5aa91d8	merge from dev	2021-02-25 18:09:32 +08:00
Shiwen Cheng	f975489374	[Improvement][SQL] Place the upgraded schema to the correct version directory and check schema errors (#4806) ... * [Improvement][sql] Keep same with 1.3.5-release * [Improvement][sql] Move the sql at the wrong version to 1.4.0 and fix issue #4650 * [Improvement][sql] Fix ci error	2021-02-25 10:35:55 +08:00