Commit Graph

930 Commits

Author SHA1 Message Date
lidongdai
83ca4b9c6e Merge remote-tracking branch 'upstream/dev' into dev 2019-07-03 20:48:54 +08:00
lidongdai
e7508469d4 update api i18n and docs 2019-07-03 20:47:18 +08:00
lidongdai
0107afe72b restore alert.properties 2019-07-03 20:32:17 +08:00
lidongdai
5e57036831 update TaskQueueImplTest 2019-07-03 20:22:49 +08:00
lgcareer
e62249a5fe
Merge pull request #508 from lgcareer/dev
remove httpcore and httpclient
2019-07-02 20:27:57 +08:00
lgcareer
7c48b98b88 remove httpcore and httpclient 2019-07-02 20:23:03 +08:00
lgcareer
4645954465
Merge pull request #288 from feloxx/feature/qiye_weixin
Feature/qiye_weixin.
2019-07-02 19:46:25 +08:00
lenboo
9ddc9a0402 Merge branch 'dev' of https://github.com/analysys/EasyScheduler into dev-up 2019-07-01 15:00:40 +08:00
lenboo
94bf5bb4b2 Merge remote-tracking branch 'upstream/branch-1.0.2' into dev-up 2019-07-01 15:00:03 +08:00
lidongdai
c8906686d4 优化worker server获取任务的性能 2019-06-27 20:48:20 +08:00
escheduler
e869a8b74a
Merge pull request #490 from blacklit/dev
add ip utils class
2019-06-26 19:53:31 +08:00
pengdou@analysys.com.cn
d83e0b6317 add ip utils class 2019-06-26 19:50:35 +08:00
乔占卫
3286f15e87
Merge pull request #489 from qiaozhanwei/branch-1.0.2
qianfan task result add judge update
2019-06-26 16:29:45 +08:00
qiaozhanwei
8b88cd0b3d qianfan task result add judge update 2019-06-26 16:09:03 +08:00
qiaozhanwei
602591aa8c qianfan task result add judge update 2019-06-26 15:42:30 +08:00
乔占卫
fe077894ba
Merge pull request #488 from qiaozhanwei/branch-1.0.2
qianfan task result add judge update
2019-06-26 11:14:03 +08:00
ligang
8f070a9240 [maven-release-plugin] prepare for next development iteration 2019-06-25 13:52:05 +08:00
ligang
63dd1f8c07 [maven-release-plugin] prepare release 1.0.4 2019-06-25 13:51:38 +08:00
bao liang
d406f86253
Merge pull request #479 from lenboo/branch-1.0.2
Update 后端部署文档.md
2019-06-25 11:05:46 +08:00
bao liang
adac6cc8e3
Update 后端部署文档.md 2019-06-25 11:05:18 +08:00
bao liang
cdec58736d
Merge pull request #478 from lenboo/branch-1.0.2
update documents
2019-06-25 10:50:57 +08:00
lenboo
e8a41b5522 update documents 2019-06-25 10:49:59 +08:00
lgcareer
be0964c652
Merge pull request #477 from lgcareer/branch-1.0.2
determine if the file exists in hdfs when read file
2019-06-24 21:00:46 +08:00
lgcareer
996dace03d determine if the file exists in hdfs when read file 2019-06-24 20:58:18 +08:00
lenboo
8f4bed90b1 merge from upstream 2019-06-24 20:29:39 +08:00
lgcareer
893af254f7
Merge pull request #476 from lgcareer/branch-1.0.2
determine if the file exists in hdfs when read file
2019-06-24 20:29:08 +08:00
lgcareer
bb6cb00878 determine if the file exists in hdfs when read file 2019-06-24 20:27:35 +08:00
lgcareer
4840ba33cf
Merge pull request #474 from lgcareer/branch-1.0.2
Update the latest version number
2019-06-24 14:12:10 +08:00
lgcareer
3f59730282 Update the latest version number 2019-06-24 14:05:05 +08:00
lgcareer
cc3c7e911e change soft_version to 1.0.4 2019-06-24 13:51:31 +08:00
lgcareer
021c00288f
Merge pull request #473 from lgcareer/branch-1.0.2
add verifyResourceName test
2019-06-24 11:59:45 +08:00
lgcareer
48389f1822 add verifyResourceName test 2019-06-24 11:49:35 +08:00
lidongdai
76323482be remove master cpu load avg 2019-06-24 11:40:23 +08:00
qiaozhanwei
b27a080baa qianfan task result add judge update 2019-06-21 11:32:14 +08:00
qiaozhanwei
5c1b3f0ed5 qianfan task result add judge 2019-06-21 10:58:02 +08:00
lgcareer
421d0219a2
Merge pull request #471 from lgcareer/branch-1.0.2
add verify resource file is exists in hdfs
2019-06-20 18:48:21 +08:00
lgcareer
33be5ff9dd update verifyResourceName 2019-06-20 18:44:58 +08:00
lgcareer
4a69289c41 add verify resource file is exists in hdfs 2019-06-20 18:42:29 +08:00
lgcareer
f72d647fb2 add RESOURCE_FILE_EXIST 2019-06-20 18:35:28 +08:00
easyscheduler
bb4471c008
Merge pull request #469 from hujiang75277381/dev
Fix naming errors,monitor page
2019-06-20 15:37:04 +08:00
xiaobiesan
93acff187e Fix naming errors.js/conf/home/pages/monitor/pages/servers/master.vue/work.vue 2019-06-20 15:23:42 +08:00
xiaobiesan
c92347e65d Merge remote-tracking branch 'upstream/dev' into HEAD 2019-06-20 15:13:53 +08:00
lgcareer
25ff540ff2 Modified SQL task custom variable replacement rules 2019-06-19 16:47:32 +08:00
lidongdai
a964e2014a delete nouse code 2019-06-17 15:40:55 +08:00
lgcareer
7b058f55f4
Merge pull request #459 from lgcareer/branch-1.0.2
The SQL task fails if the mail delivery fails
2019-06-14 18:43:49 +08:00
lgcareer
c768445322 The SQL task fails if the mail delivery fails 2019-06-14 17:27:32 +08:00
lgcareer
597f518ed5 The SQL task fails if the mail delivery fails 2019-06-14 14:30:42 +08:00
lenboo
015c78154f Merge remote-tracking branch 'upstream/branch-1.0.2' into 102 2019-06-13 10:56:05 +08:00
lenboo
efc2223c52 update user doc 2019-06-13 10:55:05 +08:00
bao liang
44f1eb94f3
Merge pull request #446 from lenboo/branch-1.0.2
update the process of getting result of yarn.
2019-06-13 10:19:38 +08:00