root
|
fc4139b852
|
Fix notification
|
2016-08-02 16:30:17 +08:00 |
|
zhong yehong
|
4ba7d3c2da
|
Merge pull request #181 from zhongyehong/customSetting
fix bug that docklet don't create generated_password file
|
2016-08-01 17:26:29 +08:00 |
|
zhongyehong
|
f2e209cb42
|
fix bug that docklet don't create generated_password file
|
2016-08-01 17:24:43 +08:00 |
|
zhong yehong
|
b7fadb3489
|
Merge pull request #179 from zhongyehong/customSetting
update CHANGES and VERSION
|
2016-07-28 12:03:43 +08:00 |
|
zhongyehong
|
2da24f9176
|
update date
|
2016-07-28 12:01:53 +08:00 |
|
zhongyehong
|
b26bb6b274
|
update CHANGES and VERSION
|
2016-07-28 12:01:11 +08:00 |
|
Yujian Zhu
|
54f9c3e084
|
Merge pull request #177 from FirmlyReality/history
History
|
2016-07-24 23:53:02 +08:00 |
|
zhuyj17
|
8e9765965e
|
Add 'Recover' action to history.
|
2016-07-24 23:48:12 +08:00 |
|
zhuyj17
|
63a2d387bd
|
Add button to history page on status page.
|
2016-07-24 18:23:27 +08:00 |
|
zhuyj17
|
1b3c12d936
|
Use database to restore the cputime,runnint time and billing.
|
2016-07-24 17:56:12 +08:00 |
|
zhuyj17
|
d0ab069657
|
Add history in web.
|
2016-07-24 13:51:01 +08:00 |
|
zhuyj17
|
381295a59d
|
To log when to create,start,stop and delete the container in container.py
|
2016-07-24 10:09:41 +08:00 |
|
Firmlyzhu
|
35af1df339
|
Add History database.
|
2016-07-22 17:40:40 +08:00 |
|
zhong yehong
|
eca0fe949c
|
Merge pull request #175 from zhongyehong/customSetting
Custom setting
|
2016-07-21 20:55:48 +08:00 |
|
zhongyehong
|
ebaceb52b9
|
Merge remote-tracking branch 'upstream/master' into customSetting
|
2016-07-21 20:51:24 +08:00 |
|
zhongyehong
|
8291643929
|
default container cpu, memory and disk can be modify in admin page
|
2016-07-21 19:19:53 +08:00 |
|
zhongyehong
|
64c228ea88
|
init usage info when start docklet with init mode
|
2016-07-21 17:43:26 +08:00 |
|
Cao, Donggang
|
b9594f3a16
|
Merge pull request #173 from caodg/master
add starting of ssh service
|
2016-07-18 16:30:40 +08:00 |
|
Donggang Cao
|
755a7a7a59
|
add starting of ssh service
|
2016-07-18 04:27:57 -04:00 |
|
Yujian Zhu
|
d60e79f32b
|
Merge pull request #171 from FirmlyReality/hostconcpupercent
Cpu percent of containers on hosts.
|
2016-07-17 15:24:05 +08:00 |
|
zhuyj17
|
3a608caa7c
|
Change the interval to update the info on webpage.
|
2016-07-17 10:22:59 +08:00 |
|
zhuyj17
|
f73aeaf9ec
|
To Compute cpu percent of a container on a host and display the result on webpage.
|
2016-07-17 10:18:30 +08:00 |
|
zhuyj17
|
2ab95f51da
|
Merge branch 'master' of https://github.com/unias/docklet into hostconcpupercent
|
2016-07-17 08:45:00 +08:00 |
|
zhong yehong
|
82d1f93b73
|
Merge pull request #170 from zhongyehong/customSetting
give user a total quota, let themselves decide how to use quota
|
2016-07-16 17:28:45 +08:00 |
|
zhongyehong
|
2a03269133
|
give user a total quota, let themselves decide how to use quota
|
2016-07-15 23:35:47 +08:00 |
|
zhuyj17
|
ddbb2b9562
|
Add collection for cpu percents of containers on hosts in monitor.py.
|
2016-07-15 17:32:01 +08:00 |
|
zhong yehong
|
4e32b718e4
|
Merge pull request #169 from zhongyehong/master
mail module
|
2016-07-02 17:23:48 +08:00 |
|
zhongyehong
|
cf358de156
|
Merge branch 'Thinginitself-checkbox'
|
2016-07-02 17:16:30 +08:00 |
|
zhongyehong
|
97a90d9c89
|
add send email checkbox when creating notification, change the style of email checkbox
|
2016-07-02 17:14:19 +08:00 |
|
zhongyehong
|
304355dfab
|
fix some bug in mail module
|
2016-07-02 17:01:25 +08:00 |
|
Thinginitself
|
aefd2a7498
|
checkbox sendmail
|
2016-06-29 21:28:41 +08:00 |
|
zhong yehong
|
2fe9c01cf4
|
Merge pull request #157 from FirmlyReality/billing
Billing
|
2016-06-28 11:40:25 +08:00 |
|
zhuyj17
|
585420c768
|
Add billing to monitor and status page.
|
2016-06-26 21:42:25 +08:00 |
|
zhuyj17
|
0f00f854ac
|
Add billing in monitor.
|
2016-06-26 21:30:57 +08:00 |
|
zhong yehong
|
1c1ca65e15
|
Merge pull request #153 from unias/revert-150-revert-149-master
Revert "Revert "some modifications""
|
2016-06-21 19:09:31 +08:00 |
|
zhong yehong
|
066969c012
|
Revert "Revert "some modifications""
|
2016-06-21 19:07:24 +08:00 |
|
zhong yehong
|
a329f84770
|
Merge pull request #152 from unias/revert-151-revert-148-master
Revert "Revert "Add notification module""
|
2016-06-21 19:06:53 +08:00 |
|
zhong yehong
|
f690c320e5
|
Revert "Revert "Add notification module""
|
2016-06-21 19:05:45 +08:00 |
|
zhong yehong
|
81526596ac
|
Merge pull request #151 from unias/revert-148-master
Revert "Add notification module"
|
2016-06-21 17:57:03 +08:00 |
|
zhong yehong
|
652c5bb5e1
|
Revert "Add notification module"
|
2016-06-21 17:56:27 +08:00 |
|
zhong yehong
|
78eba37a70
|
Merge pull request #150 from unias/revert-149-master
Revert "some modifications"
|
2016-06-21 17:56:04 +08:00 |
|
zhong yehong
|
0535bcd244
|
Revert "some modifications"
|
2016-06-21 17:55:36 +08:00 |
|
zhong yehong
|
1da7e26378
|
Merge pull request #149 from zhongyehong/master
some modifications
|
2016-06-21 17:37:51 +08:00 |
|
zhongyehong
|
fb28184e3b
|
1.add udba parameter for aufs
2.change the icon of admin page
3.fix a display error when create cluster
|
2016-06-21 17:31:44 +08:00 |
|
zhong yehong
|
f56d07b4f5
|
Merge pull request #148 from tangxiaoshuang/master
Add notification module
|
2016-06-21 17:12:20 +08:00 |
|
tangshuangpku@hotmail.com
|
61167b5680
|
还原调试设置
|
2016-06-18 14:07:19 +08:00 |
|
tangshuangpku@hotmail.com
|
cca4a91726
|
删除文档
|
2016-06-18 14:04:48 +08:00 |
|
tangshuangpku@hotmail.com
|
41cb13f0d8
|
删除文档
|
2016-06-18 13:55:52 +08:00 |
|
tangshuangpku@hotmail.com
|
7c7411eff7
|
Merge remote-tracking branch 'upstream/experiment'
|
2016-06-08 12:20:04 +08:00 |
|
tangshuangpku@hotmail.com
|
4e1b2aa00f
|
添加文档
|
2016-06-08 12:19:56 +08:00 |