Commit Graph

2431 Commits

Author SHA1 Message Date
qiaozhanwei
f02e7e8b37 pom modify 2020-04-09 22:55:26 +08:00
qiaozhanwei
3b56ae2f82 init.sql modify 2020-04-09 22:43:04 +08:00
qiaozhanwei
46dbacef25 init.sql modify 2020-04-09 22:18:50 +08:00
qiaozhanwei
62661f0f28 init.sql modify 2020-04-09 21:38:23 +08:00
qiaozhanwei
f65ab56d2d UT modify 2020-04-09 19:07:17 +08:00
qiaozhanwei
a1c000eca3 zk properties modify 2020-04-09 16:43:20 +08:00
qiaozhanwei
43b990656a modify UT 2020-04-09 16:40:01 +08:00
qiaozhanwei
6ac5777967 Merge remote-tracking branch 'remotes/upstream/dev' into dev 2020-04-09 15:27:54 +08:00
liwenhe1993
9dfc93e0a2
Exclude .mvn/jvm.config and .mvn/wrapper/maven-wrapper.properties (#2387)
* Remove .helmignore file

* Exclude .mvn/jvm.config and .mvn/wrapper/maven-wrapper.properties

When running rat, exclude .mvn/jvm.config and .mvn/wrapper/maven-wrapper.properties
2020-04-09 15:22:45 +08:00
qiaozhanwei
af2b3187b9 update pom.xml 2020-04-09 15:03:15 +08:00
qiaozhanwei
d4ad23dd46 postgresql init.sql modify 2020-04-09 14:00:34 +08:00
qiaozhanwei
2b7801090f modify ci_e2e.yml 2020-04-09 13:44:31 +08:00
qiaozhanwei
f3c85835b1 mapper add Transactional and rollback 2020-04-09 13:40:47 +08:00
qiaozhanwei
0afe9a3fc5 modify datasource.properties postgresql password 2020-04-09 13:27:56 +08:00
qiaozhanwei
18548ad1c1 modify datasource.properties postgresql password 2020-04-09 13:27:03 +08:00
qiaozhanwei
a41285983c Merge remote-tracking branch 'origin/dev' into dev 2020-04-09 12:55:03 +08:00
qiaozhanwei
e16a40ad02 Merge remote-tracking branch 'remotes/upstream/dev' into dev 2020-04-09 12:03:40 +08:00
liwenhe1993
294ec78341
Refactor dockerfile (#2384)
* Remove .helmignore file

* Refactor dockerfile
2020-04-09 11:22:47 +08:00
Zonglei Dong
57d47652fa
Add maven-wrapper support for dolphinscheduler. (#2381)
* add maven-wrapper support.

* fixes maven build command to maven-wrapper.

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-04-08 23:39:56 +08:00
dailidong
7ad7f65d42
Merge branch 'dev' into dev 2020-04-08 22:32:09 +08:00
BoYiZhang
472723d7e6
Fix document errors (#2382)
* Remove invalid code

* fix document errors

Co-authored-by: zhanglong <zhanglong@ysstech.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-04-08 22:30:31 +08:00
qiaozhanwei
692b7acdde datasource.properties modify 2020-04-08 18:13:27 +08:00
qiaozhanwei
ebca4d734b frontend conflict resolve 2020-04-08 15:58:56 +08:00
qiaozhanwei
eacc66d95d mysql and postgresql checkpoint full scale table modify 2020-04-08 15:10:47 +08:00
qiaozhanwei
99e0f4f7f9 test 2020-04-08 13:54:28 +08:00
songgg
2b0b93b912
[optimization]:remove duplicate code (#2377)
* sqlTask failed to run

* remove duplicate code

* remove duplicate code

* remove duplicate code

* remove duplicate code

* remove duplicate code

Co-authored-by: songqh <songquanhe@foxmail.com>
2020-04-07 22:27:28 +08:00
qiaozhanwei
45ea2ccfdb Merge remote-tracking branch 'remotes/upstream/dev' into dev 2020-04-07 17:33:25 +08:00
qiaozhanwei
b35baa59b8 Merge remote-tracking branch 'remotes/upstream/refactor-worker' into dev 2020-04-07 17:32:54 +08:00
qiaozhanwei
3a066f2272 javadoc compile error modify 2020-04-07 17:17:39 +08:00
qiaozhanwei
49944a4ff3 javadoc compile error modify 2020-04-07 17:10:58 +08:00
qiaozhanwei
1276e0d8e1 refactor-worker merge to dev bug fix 2020-04-07 17:04:17 +08:00
bao liang
785c34bc66
fix bug:master fault tolerance error (#2350) (#2375)
fix bug: Visit the worker page of the monitoring center, a null pointer occur(#2349)

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-04-07 16:23:31 +08:00
qiaozhanwei
b45e70f8fa refactor-worker merge to dev bug fix 2020-04-07 15:50:59 +08:00
qiaozhanwei
2ec668df9b refactor-worker merge to dev bug fix 2020-04-07 15:23:36 +08:00
itbasketplayer
d3990dfdb4
.gitignore remove taskInstance/index.vue(#2300) and no need to findProcessDefineById 2 times(#2373) (#2374)
* some optimization

* revert

* ProcessDefinitionService#updateProcessDefinition findProcessDefineById 1 time
2020-04-07 15:14:08 +08:00
qiaozhanwei
223bdec85a refactor-worker merge to dev bug fix 2020-04-07 15:12:57 +08:00
qiaozhanwei
41d8abdafb test 2020-04-07 14:33:38 +08:00
qiaozhanwei
b5546ddb68 refactor-worker merge to dev bug fix 2020-04-07 14:28:05 +08:00
qiaozhanwei
433b41dd7f refactor-worker merge to dev bug fix 2020-04-07 13:29:20 +08:00
break60
bd6adf284d
Fix the problem of data echo in script edit box (#2366)
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-04-04 12:17:02 +08:00
qiaozhanwei
94713cef79 refactor-worker merge to dev bug fix 2020-04-03 15:24:18 +08:00
qiaozhanwei
be1494fd7f refactor-worker merge to dev bug fix 2020-04-03 12:35:56 +08:00
zixi0825
69e000b542
#2282 fix workflow dependent bug (#2329)
* fix workflow dependent bug

* fix workflow dependent bug 2

* fix workflow dependent bug 2

Co-authored-by: sunchaohe <sunzhaohe@linklogis.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-04-03 00:16:01 +08:00
xingchun-chen
949b8ef17d
Merge pull request #2354 from break60/dev
Corrections to historical jar packages and resource data
2020-04-02 17:52:58 +08:00
break60
ef8d64aacc fix 2020-04-02 17:32:00 +08:00
break60
5bff786e7c Fix the problem of data echo in script edit box 2020-04-02 17:00:16 +08:00
break60
8da2a50d16 Corrections to historical jar packages and resource data 2020-04-01 21:05:54 +08:00
qiaozhanwei
1f43925c12 remove ExecuteTaskRequestCommand and ExecuteTaskResponseCommand 2020-04-01 18:34:25 +08:00
qiaozhanwei
4bda3cd92c conflict reslove 2020-04-01 18:29:47 +08:00
break60
8561d65b2b Corrections to historical jar packages and resource data 2020-04-01 17:38:57 +08:00