Commit Graph

777 Commits

Author SHA1 Message Date
millionfor 70a44bd09d
Merge pull request #329 from millionfor/branch-1.0.2
Branch 1.0.2
2019-05-22 17:43:09 +08:00
gongzijian 84b0b188ae Merge remote-tracking branch 'upstream/branch-1.0.2' into branch-1.0.2 2019-05-22 17:42:29 +08:00
gongzijian 4292229bd3 rename bug1 2019-05-22 17:42:17 +08:00
ligang 4f1c41c0a7 Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2 2019-05-22 17:30:17 +08:00
millionfor e6f65a8284
Merge pull request #328 from millionfor/branch-1.0.2
Branch 1.0.2
2019-05-22 17:25:56 +08:00
gongzijian 0f2b2a2ce2 Merge remote-tracking branch 'upstream/branch-1.0.2' into branch-1.0.2 2019-05-22 17:24:56 +08:00
gongzijian 086b34d63a rename bug 2019-05-22 17:23:26 +08:00
hymzcn 7b163f8e16
Merge pull request #327 from hymzcn/branch-1.0.2
fixed the batch delete
2019-05-22 17:20:20 +08:00
huyuanming 32b9737e0e fixed the batch delete 2019-05-22 17:18:56 +08:00
ligang 9b206778ea remove annotation 2019-05-22 16:22:34 +08:00
ligang 39f94615b2 remove annotation 2019-05-22 16:19:29 +08:00
ligang 5739eb0de2 add monitorServerState 2019-05-22 16:16:01 +08:00
hymzcn 434b60a131
Merge pull request #326 from hymzcn/branch-1.0.2
gantt
2019-05-22 15:04:53 +08:00
huyuanming 92e8da4435 gantt 2019-05-22 15:02:54 +08:00
乔占卫 6020b6b26a
Merge pull request #323 from qiaozhanwei/branch-1.0.2
support ubuntu and centos6 deploy update
2019-05-21 19:19:17 +08:00
qiaozhanwei db55e8ed71 support ubuntu and centos6 deploy update 2019-05-21 19:17:36 +08:00
gongzijian d45bf677a4 Merge remote-tracking branch 'upstream/branch-1.0.2' into branch-1.0.2 2019-05-21 17:46:30 +08:00
escheduler 3becf59268
Merge pull request #312 from hymzcn/branch-1.0.2
add taskInstance link, add email title input

instans batch delete, tenant delete, definition delete
2019-05-21 17:42:20 +08:00
huyuanming b946791d80 instans batch delete, tenant delete, definition delete 2019-05-21 17:31:29 +08:00
lgcareer a221ec0a6c
Merge pull request #322 from lgcareer/branch-1.0.2
add checkExists in deleteJob
2019-05-21 15:42:08 +08:00
ligang 12d36760b8 add checkExists in deleteJob 2019-05-21 15:37:31 +08:00
ligang 7dc7348c3c Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2 2019-05-21 15:05:12 +08:00
millionfor e171234f2a
Merge pull request #321 from millionfor/branch-1.0.2
Branch 1.0.2
2019-05-21 14:58:18 +08:00
gongzijian 0cfa35da4e fix 2019-05-21 14:57:29 +08:00
gongzijian 7b1f95d067 t 2019-05-21 14:56:02 +08:00
gongzijian d5cacb192e 修改文件显示问题 2019-05-21 14:55:21 +08:00
baoliang 6ea71e1ede add tolerance tasks when start failure task 2019-05-21 13:35:35 +08:00
huyuanming 02d5c53a1c add taskInstance link, add email title input 2019-05-20 16:54:18 +08:00
乔占卫 0cc61f5d8d
Merge pull request #316 from qiaozhanwei/branch-1.0.2
.escheduler_env.sh update
2019-05-20 15:17:14 +08:00
qiaozhanwei 1e742eed2c .escheduler_env.sh update 2019-05-20 15:16:15 +08:00
乔占卫 ecc899ed70
Merge pull request #315 from qiaozhanwei/branch-1.0.2
solve nginx 504 Gateway Time-out
2019-05-20 15:03:06 +08:00
qiaozhanwei e8c8487cb4 solve nginx 504 Gateway Time-out 2019-05-20 15:01:57 +08:00
bao liang a33fddc263
Merge pull request #314 from lenboo/branch-1.0.2
fix bugs:global parameters,unit calculate error,tolerance tasks...
2019-05-20 14:48:58 +08:00
baoliang faf993e6b7 delete unused code 2019-05-20 14:44:52 +08:00
ligang 55d5314428 Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2 2019-05-20 14:31:01 +08:00
gongzijian 7e6742182a test 2019-05-20 14:18:49 +08:00
lilin 28ba72b1eb 修改如果用户没有创建资源时给用户授权资源会报空指针 2019-05-20 14:10:22 +08:00
lilin f420d24187 提示信息不正确 2019-05-20 14:10:09 +08:00
baoliang 13e31da0c5 Merge remote-tracking branch 'upstream/branch-1.0.2' into 102 2019-05-20 14:07:55 +08:00
huyuanming a869796140 env 2019-05-20 10:33:53 +08:00
huyuanming 8116a1a532 test 2019-05-20 10:29:57 +08:00
huyuanming f785d11309 env 2019-05-20 10:15:10 +08:00
hymzcn 5956409a67
Merge pull request #311 from hymzcn/branch-1.0.2
env
2019-05-20 10:13:52 +08:00
huyuanming d1490155c2 env 2019-05-20 10:09:05 +08:00
乔占卫 3ef73aea6b
Merge pull request #304 from qiaozhanwei/branch-1.0.2
only one master restart need failure and tolerant task restart scheduler
2019-05-17 15:10:31 +08:00
qiaozhanwei 0d5b4abcbf only one master restart need failure and tolerant task restart scheduler 2019-05-17 15:09:27 +08:00
baoliang 0bf8e270a6 fix bug: tolerance task need not to check retry times 2019-05-17 11:14:19 +08:00
baoliang a40fcc0efa fix bug: unit calculate error 2019-05-16 19:30:17 +08:00
乔占卫 0ee5bfc49b
Merge pull request #302 from qiaozhanwei/branch-1.0.2
work tolerance update
2019-05-16 19:17:27 +08:00
qiaozhanwei ad18251c7a work tolerance update 2019-05-16 19:16:13 +08:00