Commit Graph

2509 Commits

Author SHA1 Message Date
break60
ce73b9b074 fix 2020-08-17 18:35:18 +08:00
break60
be3550cf05 [ui]Script input box to modify the delay loading time 2020-08-17 18:22:33 +08:00
qiaozhanwei
54f0c2c8de Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.3.2-release 2020-08-17 17:26:14 +08:00
qiaozhanwei
917a4b20b5
release 1.3.2 version rollback (#3527)
* [Feature] JVM parameter optimization , related issue #3370

* [Feature] JVM parameter optimization , related issue #3370

* test release 1.3.2 version rollback

* test release 1.3.2 version rollback

* test

* test release 1.3.2 version rollback

* modify tag 1.3.0 to HEAD

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-08-17 14:21:13 +08:00
qiaozhanwei
0559efa692 Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.3.2-release 2020-08-17 14:17:20 +08:00
qiaozhanwei
32edd19ac5 [maven-release-plugin] prepare for next development iteration 2020-08-17 14:03:19 +08:00
qiaozhanwei
4d2f0b0578 [maven-release-plugin] prepare release 1.3.2 2020-08-17 14:03:08 +08:00
lgcareer
78f0dccfb8
remove OGNL part of the mybaits notice (#3526) 2020-08-17 13:42:38 +08:00
qiaozhanwei
11d3c07e46
modify tag 1.3.0 to HEAD (#3525)
* [Feature] JVM parameter optimization , related issue #3370

* [Feature] JVM parameter optimization , related issue #3370

* test release 1.3.2 version rollback

* test release 1.3.2 version rollback

* test

* test release 1.3.2 version rollback

* modify tag 1.3.0 to HEAD

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-08-17 11:46:35 +08:00
qiaozhanwei
2ed5f062c1 modify tag 1.3.0 to HEAD 2020-08-17 11:26:42 +08:00
qiaozhanwei
944758b288 Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.3.2-release 2020-08-17 11:21:59 +08:00
xingchun-chen
1141ab6e68
Merge pull request #3513 from yangyichao-mango/hotfix-docker-1.3.2
[Hotfix][ci] Fix e2e ci docker image build error for 1.3.2-release
2020-08-17 09:41:16 +08:00
Yichao Yang
eefb0bf031 [Hotfix][ci] Fix e2e ci docker image build error 2020-08-15 20:35:04 +08:00
xingchun-chen
96a869d422
Merge pull request #3506 from XiaotaoYi/1.3.2-release
[bug-3480][server]fix ds muti-level directory in zk, which lead to fail to assign work
2020-08-15 10:43:11 +08:00
lenboo
0a0515ec63 Merge remote-tracking branch 'upstream/1.3.2-release' into 132-checkadmin 2020-08-15 08:31:23 +08:00
lenboo
553af77803 add login user check some actions in api 2020-08-15 08:31:02 +08:00
XiaotaoYi
5fdc43cdca fix ds muti-level directory in zk, which lead to fail to assign work 2020-08-14 23:00:57 +08:00
qiaozhanwei
f3f895751b [maven-release-plugin] prepare for next development iteration 2020-08-14 19:20:27 +08:00
qiaozhanwei
f19b125374 [maven-release-plugin] prepare release 1.3.2 2020-08-14 19:20:17 +08:00
qiaozhanwei
4ba6b35b0f
test release 1.3.2 version rollback (#3504)
* [Feature] JVM parameter optimization , related issue #3370

* [Feature] JVM parameter optimization , related issue #3370

* test release 1.3.2 version rollback

* test release 1.3.2 version rollback

* test

* test release 1.3.2 version rollback

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-08-14 18:55:03 +08:00
qiaozhanwei
d86cc4be79 Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.3.2-release 2020-08-14 18:52:30 +08:00
qiaozhanwei
f50353f8a6 [maven-release-plugin] prepare for next development iteration 2020-08-14 18:26:09 +08:00
qiaozhanwei
afd227a179 [maven-release-plugin] prepare release 1.3.2 2020-08-14 18:25:59 +08:00
qiaozhanwei
660eb5a1e6
test release 1.3.2 version rollback (#3503)
* [Feature] JVM parameter optimization , related issue #3370

* [Feature] JVM parameter optimization , related issue #3370

* test release 1.3.2 version rollback

* test release 1.3.2 version rollback

* test

* test release 1.3.2 version rollback

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-08-14 18:19:19 +08:00
qiaozhanwei
ed6f5791fe test release 1.3.2 version rollback 2020-08-14 18:17:05 +08:00
qiaozhanwei
e26b654ee6 test 2020-08-14 18:16:22 +08:00
qiaozhanwei
177b7b9065 Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.3.2-release 2020-08-14 18:08:19 +08:00
xingchun-chen
a01a9810bd
Merge pull request #3502 from apache/revert-3497-1.3.2-release-docker-fix
Revert "fix ci_e2e fail"
2020-08-14 18:03:52 +08:00
xingchun-chen
c0bed396c4
Merge pull request #3500 from break60/1.3.2-release
[Fix-3469][ui]The value of maintenance resources and the filtering of…
2020-08-14 18:03:30 +08:00
qiaozhanwei
abd20af75c Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.3.2-release 2020-08-14 18:01:25 +08:00
lgcareer
545beae491 Revert "fix ci_e2e fail (#3497)"
This reverts commit e367f90bb7.
2020-08-14 17:58:10 +08:00
break60
2c460c6278 fix 2020-08-14 17:56:36 +08:00
break60
52aaf0ec92 [Fix-3469][ui]The value of maintenance resources and the filtering of resources according to different program types 2020-08-14 17:44:57 +08:00
qiaozhanwei
b5f0f23d85 [maven-release-plugin] prepare for next development iteration 2020-08-14 17:37:33 +08:00
qiaozhanwei
88b3ef5d30 [maven-release-plugin] prepare release 1.3.2 2020-08-14 17:37:23 +08:00
qiaozhanwei
45424ec265
test release 1.3.2 version rollback (#3499)
* [Feature] JVM parameter optimization , related issue #3370

* [Feature] JVM parameter optimization , related issue #3370

* test release 1.3.2 version rollback

* test release 1.3.2 version rollback

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-08-14 17:31:09 +08:00
qiaozhanwei
3191bfd19c test release 1.3.2 version rollback 2020-08-14 17:27:03 +08:00
qiaozhanwei
b4b8c801ed test release 1.3.2 version rollback 2020-08-14 17:24:07 +08:00
qiaozhanwei
a7ac1bb497 Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.3.2-release 2020-08-14 17:21:31 +08:00
lgcareer
5f5c08402f
[Fix-3469][api]Should filter the resource by the different program type (#3498)
* [Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource

* [Fix-3469][api]Should list python file and jar file

* [Fix-3469][api]Should filter the resource by the different program type

* [Fix-3469][api]fix the code smell
2020-08-14 16:47:01 +08:00
lgcareer
e367f90bb7
fix ci_e2e fail (#3497) 2020-08-14 16:15:32 +08:00
qiaozhanwei
c6f0c8901c [maven-release-plugin] prepare for next development iteration 2020-08-14 16:04:49 +08:00
qiaozhanwei
8a6732ae4c [maven-release-plugin] prepare release 1.3.2 2020-08-14 16:04:38 +08:00
qiaozhanwei
6d33aa7127 Merge remote-tracking branch 'remotes/upstream/1.3.2-release' into 1.3.2-release 2020-08-14 14:57:25 +08:00
bao liang
5756d6b029
fix bug: Fix master task dependency check bug (#3473)
Co-authored-by: lenboo <baoliang@analysys.com.cn>
2020-08-13 19:02:14 +08:00
xingchun-chen
927985c012
Merge pull request #3485 from break60/1.3.2-release
[Feture-3327][ui]Add the function of re-uploading files in the udf su…
2020-08-13 17:57:02 +08:00
break60
7a866ff20a [Feture-3327][ui]Add the function of re-uploading files in the udf subdirectory 2020-08-13 17:42:08 +08:00
xingchun-chen
0b2da77751
Merge pull request #3484 from break60/1.3.2-release
[fixBug-3058][ui]Fix connection abnormalities in historical workflow …
2020-08-13 17:40:46 +08:00
break60
a78f5c0337 [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data 2020-08-13 17:13:28 +08:00
lgcareer
c8322482bb
[Fix-3463][api]Fixed that run the sql task will be failure after rename the udf resource (#3482) 2020-08-13 16:19:11 +08:00