Commit Graph

202 Commits

Author SHA1 Message Date
zhuyj17 10dfefe5bd Merge branch 'experiment' of https://github.com/unias/docklet into experiment 2016-06-08 01:06:36 +08:00
zhong yehong ce4eadee5d Merge pull request #129 from zhongyehong/master
url error
2016-06-07 15:34:01 +08:00
zhongyehong cf1419dfae Merge remote-tracking branch 'upstream/master' 2016-06-07 15:30:55 +08:00
zhongyehong 1c09cb94c0 fix url error after dealing with request 2016-06-07 15:25:46 +08:00
zhongyehong 0316fe2973 fix url error after dealing with request 2016-06-07 15:19:59 +08:00
leebaok 62c622e406 Merge pull request #124 from nsknojj/experiment
BigFileUpload
2016-06-05 09:42:56 -05:00
leebaok 3c66b19c9b Merge pull request #126 from fanshibear/experiment
Report for admin interface.
2016-06-05 09:38:30 -05:00
fanshibear a368ebe31b Report for admin interface 2016-06-05 10:56:30 +08:00
fanshibear 8178d15aa4 index.html 2016-06-05 10:55:23 +08:00
Toby Zhang 6834ea6dae BigFileUpload
BigFileUpload
2016-06-02 12:33:05 -04:00
Donggang Cao 177fedeefd add pullreq demo 2016-06-02 12:37:30 +08:00
Cao, Donggang b006c2e272 Create README.md 2016-06-02 12:09:36 +08:00
zhong yehong f674fc9783 Merge pull request #115 from fanshibear/master
Limit privileges one can get via the admin page
2016-05-30 15:45:10 +08:00
PedroLiu 896622fdb9 Merge pull request #122 from PedroLiu/master
Add version information
2016-05-24 20:36:51 +08:00
Peidong Liu 8ee470ea4f Merge remote-tracking branch 'origin/master' 2016-05-24 20:35:22 +08:00
Peidong Liu c0802b1d44 Add version infomation in base_AdminLTE.html 2016-05-24 20:31:22 +08:00
Peidong Liu 7379367008 Add version infomation in base_AdminLTE.html 2016-05-24 20:29:36 +08:00
leebaok 4a2d86ad71 Merge pull request #120 from leebaok/master
delete some unused code
#114
2016-05-24 04:02:29 -05:00
leebaok 9041bb09a1 delete some unused code 2016-05-24 16:59:06 +08:00
PedroLiu ce870d0649 Merge pull request #118 from PedroLiu/master
fix an activating bug
2016-05-23 10:12:19 +08:00
Peidong Liu a28743c62f fix a activating bug 2016-05-23 10:11:01 +08:00
leebaok 6dad5d9f4d Merge pull request #116 from FirmlyReality/logbug
Logbug
2016-05-22 10:05:22 -05:00
leebaok 209f3c1d1c Merge pull request #117 from SourceZh/separate
add more comments for independent starting of master and workers
2016-05-22 10:02:43 -05:00
ooooo 82be8a8476 add more comments for independent starting of master and workers 2016-05-22 22:48:24 +08:00
zhuyj17 117cb718ff When worker is stopped, hosts realtime page will stop to fetch cpu and memory information. 2016-05-21 16:13:03 +08:00
zhuyj17 ec5861d67c When container is stopped, running time and disk usage will also be displayed. 2016-05-21 15:48:37 +08:00
zhuyj17 cd43e0889d Let the rpc server not to log the requests. 2016-05-21 15:28:10 +08:00
Fan Shixiong 603662a350 Limit the privileges one can get via the admin page. 2016-05-19 08:59:38 -07:00
Fan Shixiong e9175e08fb Merge branch 'master' of https://github.com/unias/docklet 2016-05-19 06:17:05 -07:00
cuiwei13 ec3f3611bf bug fixed: error path specified by running -- docklet-worker start-meter 2016-05-19 02:43:58 +08:00
cuiwei13 08f2f03014 add start/stop options on docklet worker; 2016-05-19 02:32:52 +08:00
cuiwei13 94aa5841f3 integrade dockmeter local features:
1) smart cgroup controlling;
2) account billing;
3) libs to get host resources / process runtime elapsed;
2016-05-19 02:13:57 +08:00
leebaok 71fe755aec add notes in CHANGES 2016-05-18 13:40:51 +08:00
leebaok 755f135f60 Merge pull request #110 from FirmlyReality/realtime
Compute running time of containers.
2016-05-17 04:13:27 -05:00
leebaok d5585e55d3 Merge remote-tracking branch 'upstream/master' 2016-05-17 17:11:16 +08:00
leebaok 923e9bdd9d prepare for version 0.2.7 2016-05-17 17:09:10 +08:00
cuiwei13 311e4e96fe add security options for containers; 2016-05-16 22:21:37 +08:00
Fan Shixiong b4342d92cf Label invalid values. Enable long words to be displayed. 2016-05-16 06:24:03 -07:00
zhong yehong 443f8d6395 Merge pull request #107 from fanshibear/master
Add administration features
2016-05-16 17:43:09 +08:00
zhuyj17 bacd43a5db Compute running time of a container. 2016-05-16 10:12:10 +08:00
zhuyj17 0f03dadc0e Add running time to monitor.py 2016-05-16 00:48:17 +08:00
zhuyj17 d8092fa3f1 Move monitoring information of container to 'monitor_vnodes[owner]'. 2016-05-16 00:07:21 +08:00
Fan Shixiong 4400282343 Add administration features for administrators to configure Docklet 2016-05-15 07:12:06 -07:00
zhong yehong 4821afe3fb Merge pull request #102 from zhongyehong/master
remove guest dashboard
2016-05-09 15:15:45 +08:00
zhongyehong 60ce611033 Merge remote-tracking branch 'upstream/master' 2016-05-09 15:12:55 +08:00
zhongyehong cdea33eb72 remove guest, fix a bug in httprest.py. 2016-05-09 15:09:55 +08:00
zhong yehong aeacacb65e Merge pull request #101 from zhongyehong/master
fix some error
2016-05-09 12:53:51 +08:00
zhongyehong 1bdd11ea5a Merge remote-tracking branch 'upstream/master' 2016-05-09 12:49:19 +08:00
leebaok 74957e7123 Merge pull request #100 from FirmlyReality/rpcmonitor
Use rpc to transfer monitor message.
2016-05-08 23:13:20 -05:00
zhongyehong c7d3f1e4df change the description of data_quota and data_quota_volume 2016-05-09 12:04:19 +08:00