zhuyj17
|
e539e2da17
|
Fix some bugs
|
2018-10-22 01:24:26 +08:00 |
|
zhuyj17
|
ba0a0034ee
|
Merge branch 'master' of https://github.com/unias/docklet into batch
|
2018-10-22 00:48:36 +08:00 |
|
Yujian Zhu
|
62d2c6bbbc
|
Merge pull request #346 from FirmlyReality/master
update status.html that use container name to tag the data
|
2018-10-22 00:48:21 +08:00 |
|
zhuyj17
|
949b77c9b8
|
update status.html
|
2018-10-22 00:47:06 +08:00 |
|
zhuyj17
|
cfeab99ae1
|
Add new api to get all batch containers of a user
|
2018-10-22 00:39:33 +08:00 |
|
zhong yehong
|
8865e205d1
|
Merge pull request #345 from zhongyehong/batch
divide worker into two kinds
|
2018-10-21 20:28:42 +08:00 |
|
zhongyehong
|
d80e49816b
|
divide worker into two kinds
|
2018-10-21 20:21:54 +08:00 |
|
zhong yehong
|
b4d72a809b
|
Merge pull request #344 from zhongyehong/master
release lock when exception occur
|
2018-10-21 14:57:08 +08:00 |
|
zhongyehong
|
e765225d62
|
release lock when exception occur
|
2018-10-21 14:00:50 +08:00 |
|
zhongyehong
|
6d29858905
|
release lock when exception occur
|
2018-10-20 21:33:55 +08:00 |
|
Yujian Zhu
|
941c70d4b3
|
Merge pull request #342 from FirmlyReality/batch
Update container collector to monitor container from batch job.
|
2018-10-14 22:49:28 +08:00 |
|
zhuyj17
|
ae95101e90
|
Merge branch 'master' of https://github.com/unias/docklet into batch
|
2018-10-14 22:48:17 +08:00 |
|
Yujian Zhu
|
d190b90766
|
Merge pull request #341 from FirmlyReality/master
Aggregate api of monitor at the backend
|
2018-10-14 22:47:59 +08:00 |
|
zhuyj17
|
6a3e1eace7
|
Aggregate http request on status realtime pages for monitor information
|
2018-10-14 22:45:24 +08:00 |
|
zhuyj17
|
c1ba31a4b6
|
Aggregate api of monitor at the backend
|
2018-10-14 21:34:46 +08:00 |
|
zhuyj17
|
1a866b9c8b
|
Update container collector to monitor container from batch job.
|
2018-10-14 20:38:50 +08:00 |
|
Yujian Zhu
|
0281f1d0b5
|
Merge pull request #340 from FirmlyReality/batch
Use oss mounter and update mountpoint
|
2018-10-09 10:45:11 +08:00 |
|
zhuyj17
|
42749d4a8e
|
Mount on '/opt/docklet/global/users/oss'
|
2018-10-09 10:43:43 +08:00 |
|
zhuyj17
|
528d64f521
|
Update oss mounter and rpc
|
2018-10-08 09:52:48 +08:00 |
|
zhuyj17
|
e06464758d
|
Add ossmounter
|
2018-10-08 09:08:58 +08:00 |
|
Yujian Zhu
|
aaafa7be1a
|
Merge pull request #339 from FirmlyReality/batch
Aliyun oss can be mounted to the container when using batch job computing.
|
2018-09-26 00:32:52 +08:00 |
|
Firmlyzhu
|
4d81254f04
|
Enable that Mount aliyun oss when using batch job computing.
|
2018-09-24 16:39:08 +08:00 |
|
zhuyj17
|
4912526dac
|
Merge branch 'batch' of https://github.com/FirmlyReality/docklet into batch
|
2018-09-23 23:20:04 +08:00 |
|
zhuyj17
|
371ec5e535
|
Merge branch 'master' of https://github.com/unias/docklet into batch
|
2018-09-23 23:17:37 +08:00 |
|
Yujian Zhu
|
6651b064ff
|
Merge pull request #338 from FirmlyReality/batch
Update Batch from master
|
2018-09-23 12:47:32 +08:00 |
|
Firmlyzhu
|
a10b9393f6
|
Merge branch 'master' of https://github.com/unias/docklet into batch
|
2018-09-23 12:45:14 +08:00 |
|
Yujian Zhu
|
69059c3fff
|
Merge pull request #337 from FirmlyReality/login_info
further update
|
2018-09-20 00:24:49 +08:00 |
|
zhuyj17
|
f5e960a80a
|
further update
|
2018-09-20 00:23:43 +08:00 |
|
Yujian Zhu
|
b07eb75a62
|
Merge pull request #336 from FirmlyReality/login_info
Prevent users that is not activated from applying for beans
|
2018-09-20 00:19:57 +08:00 |
|
zhuyj17
|
4ddab4fa4b
|
Check if user is activated before applying for beans
|
2018-09-20 00:16:53 +08:00 |
|
zhuyj17
|
7497e58bdc
|
Fix a bug of not import urlencode
|
2018-09-19 22:57:16 +08:00 |
|
Yujian Zhu
|
cba223104c
|
Merge pull request #335 from FirmlyReality/login_info
Login info
|
2018-09-16 23:22:31 +08:00 |
|
Firmlyzhu
|
7e470463b1
|
add login info into db
|
2018-09-16 16:18:06 +08:00 |
|
Firmlyzhu
|
987077e7d7
|
Add information of login to user log
|
2018-09-16 15:52:15 +08:00 |
|
Firmlyzhu
|
46ea09828d
|
fix a bug that net stats can't be shown
|
2018-09-16 14:56:27 +08:00 |
|
GallenShao
|
62fd6463c2
|
Merge pull request #334 from GallenShao/batch
[taskmgr] fix a avaliable memory calc bug
|
2018-08-10 14:42:31 +08:00 |
|
Gallen
|
6bc2a06705
|
[taskmgr] fix a avaliable memory calc bug
|
2018-08-10 13:40:58 +08:00 |
|
Yan Li
|
a77e6a8d38
|
Merge pull request #333 from iteratorlee/dev_batch
update front end
|
2018-08-10 13:11:17 +09:00 |
|
iteratorlee
|
d566aea195
|
update front end
|
2018-08-10 12:10:25 +08:00 |
|
Yujian Zhu
|
f47f17e092
|
Merge pull request #332 from FirmlyReality/batch
Fix a bug of output redirect in taskcontroller
|
2018-08-10 11:20:23 +08:00 |
|
Firmlyzhu
|
52ad1cf608
|
Fix a bug of output redirect in taskcontroller
|
2018-08-10 11:19:14 +08:00 |
|
Yan Li
|
ffe2a0487d
|
Merge pull request #331 from iteratorlee/dev_batch
fix package path bug
|
2018-08-10 12:07:59 +09:00 |
|
iteratorlee
|
0db9a7c287
|
fix package path bug
|
2018-08-10 11:06:47 +08:00 |
|
GallenShao
|
ae26d3153f
|
Merge pull request #330 from GallenShao/batch
bug fix
|
2018-08-08 22:37:20 +08:00 |
|
Gallen
|
111a835d62
|
bug fix
|
2018-08-08 22:36:35 +08:00 |
|
Yan Li
|
58099d9e0c
|
Merge pull request #329 from iteratorlee/dev_batch
update httprest.py
|
2018-08-08 23:04:25 +09:00 |
|
iteratorlee
|
b596196be6
|
update
|
2018-08-08 22:03:02 +08:00 |
|
GallenShao
|
8d8e82e0bc
|
Merge pull request #328 from GallenShao/batch
update taskmgr
|
2018-08-08 21:53:45 +08:00 |
|
Gallen
|
0a4507b3a5
|
update
|
2018-08-08 21:51:27 +08:00 |
|
Yan Li
|
803be73390
|
Merge pull request #327 from iteratorlee/dev_batch
add job list viewing
|
2018-08-08 22:49:28 +09:00 |