leebaok
|
5bbbe705b4
|
Merge branch 'master' into network-ip-check
|
2016-05-06 16:56:53 +08:00 |
|
Cao, Donggang
|
91f9500121
|
Merge pull request #84 from caodg/master
fix a bug in worker.py of var not found error
|
2016-05-05 12:37:25 +08:00 |
|
Donggang Cao
|
4396710c6f
|
fix a bug in worker.py of var not found error
|
2016-05-05 00:25:25 -04:00 |
|
leebaok
|
b22a34882c
|
Merge pull request #82 from FirmlyReality/diskbug
Fix a bug in monitor.py, which may stop the thread.
|
2016-05-04 09:07:23 -05:00 |
|
leebaok
|
e226fb27c8
|
Merge pull request #83 from SourceZh/separate
fix a bug of independent starting master and worker.
|
2016-05-04 08:46:38 -05:00 |
|
ooooo
|
f4c5126b06
|
rename variable
|
2016-05-04 20:15:19 +08:00 |
|
ooooo
|
ff7c5b04df
|
fix a bug
|
2016-05-04 20:08:50 +08:00 |
|
leebaok
|
a17aff2b20
|
Merge pull request #81 from SourceZh/separate
Independent starting of master and worker. But not work for **init mode** of startup.
|
2016-05-04 06:37:05 -05:00 |
|
ooooo
|
8fcdd229e3
|
delete method getnode in etcdlib.py
|
2016-05-04 11:54:24 +08:00 |
|
zhuyj17
|
8a1056a0bf
|
Fix a bug in monitor.py, which may stop the thread.
|
2016-05-04 11:54:11 +08:00 |
|
PedroLiu
|
7b93c9f390
|
Merge pull request #79 from PedroLiu/master
Bug fix
|
2016-05-03 22:36:20 +08:00 |
|
Peidong Liu
|
628c478198
|
Fix a bug that will occur when user token expires.
Closed the debug mode in httprest.py and web.py
Now 500 error in web.py will lead to a 500 page
500 error in httprest.py will lead to logout page
|
2016-05-03 22:29:32 +08:00 |
|
leebaok
|
10560577ad
|
Merge pull request #78 from leebaok/master
Master : disable debug mode of flask in httprest.py
|
2016-05-03 06:31:38 -05:00 |
|
leebaok
|
44cd289cea
|
Master : disable debug mode of flask in httprest.py
debug mode of flask will restart the process
this will make some work before flask lost
|
2016-05-03 19:04:58 +08:00 |
|
leebaok
|
6a4dae1d1c
|
[merge] merge flask-rewrite with reuse-vlanid
|
2016-05-03 17:06:30 +08:00 |
|
leebaok
|
f8bce19fa9
|
Merge branch 'master' of https://github.com/PedroLiu/docklet into merge-flask-rewrite
|
2016-05-03 16:47:19 +08:00 |
|
leebaok
|
7deb9852b0
|
Merge branch 'master' into network-ip-check
|
2016-05-03 16:31:15 +08:00 |
|
leebaok
|
9ebd3673bf
|
Merge pull request #73 from jklj077/master
vlan ids reusing
|
2016-05-03 03:23:58 -05:00 |
|
Peidong Liu
|
80144894b4
|
Merge branch 'master' of https://github.com/PedroLiu/docklet
|
2016-05-03 15:40:39 +08:00 |
|
zhuyj17
|
d4cbf43ed1
|
Using flask to display monitor info.
|
2016-05-03 15:31:53 +08:00 |
|
Peidong Liu
|
2fc5a79163
|
Now backend is flask-styled
fix a bug that will cause 404 in /login/
|
2016-05-03 15:31:53 +08:00 |
|
Peidong Liu
|
a1fb4b0aee
|
Test the code
|
2016-05-03 15:03:28 +08:00 |
|
zhuyj17
|
718d70d357
|
Using flask to display monitor info.
|
2016-04-30 16:45:48 +08:00 |
|
zhong yehong
|
26b2961dc9
|
Merge pull request #74 from zhongyehong/master
pay attention
|
2016-04-29 16:12:13 +08:00 |
|
zhongyehong
|
d5d12d3c06
|
fix some css style in datatable
|
2016-04-29 16:08:10 +08:00 |
|
zhongyehong
|
a0ca4e5081
|
Merge remote-tracking branch 'upstream/master'
|
2016-04-29 15:43:17 +08:00 |
|
zhongyehong
|
7b96837dfe
|
add upgrade.py to upgrade some configure file
add data space quota, but it doesn't work now
add default quota group, can change it in admin page
fix a bug when user first time to create image
|
2016-04-29 15:40:53 +08:00 |
|
jklj077
|
e8f96133d7
|
fix bugs related to vlan ids reusing
|
2016-04-29 13:47:56 +08:00 |
|
jklj077
|
9906f0588f
|
reuse vlanids
|
2016-04-29 12:58:48 +08:00 |
|
ooooo
|
2741371153
|
delete unused var
|
2016-04-27 16:54:47 +08:00 |
|
ooooo
|
c2c2adaa39
|
delete unused var
|
2016-04-27 16:43:11 +08:00 |
|
ooooo
|
996d73c3f4
|
Merge remote-tracking branch 'upstream/master' into separate
|
2016-04-27 16:37:31 +08:00 |
|
ooooo
|
25ba87423d
|
fix a little bug
|
2016-04-27 16:36:32 +08:00 |
|
zhongyehong
|
961baf6ae2
|
add disk quota
|
2016-04-27 16:31:46 +08:00 |
|
ooooo
|
a1c166bb09
|
use heartbeat package to keep worker alive in order to separate worker and master
|
2016-04-27 16:21:04 +08:00 |
|
Peidong Liu
|
c56c3d52db
|
Now backend is flask-styled
fix a bug that will cause 404 in /login/
|
2016-04-27 15:59:33 +08:00 |
|
Cao, Donggang
|
ea929a4dec
|
Merge pull request #67 from FirmlyReality/Truename
Add truename on Node list page, for #54
|
2016-04-25 06:06:32 +08:00 |
|
zhuyj17
|
fb2148833b
|
Add truename on Node list page.
|
2016-04-25 01:00:06 +08:00 |
|
leebaok
|
4b634e6eb1
|
Merge pull request #66 from FirmlyReality/diskusage
Diskusage
|
2016-04-23 18:46:08 +08:00 |
|
zhuyj17
|
237ce6f26f
|
Display disk usage on status page.
|
2016-04-23 18:42:04 +08:00 |
|
zhuyj17
|
92c839ff45
|
Modify the table on status and status realtime pages.
|
2016-04-23 17:45:49 +08:00 |
|
zhuyj17
|
a343c16847
|
Modify the unit on host Realtime page.
|
2016-04-23 17:04:00 +08:00 |
|
Yujian Zhu
|
f5c71e6d0f
|
Merge pull request #65 from FirmlyReality/display_vnode_owner
Display owner of container on Node list page.
|
2016-04-23 16:38:55 +08:00 |
|
zhuyj17
|
6075fe54c4
|
Display owner of container on Node list page.
|
2016-04-23 16:37:15 +08:00 |
|
ooooo
|
839ea23135
|
separate master and worker
|
2016-04-20 14:50:53 +08:00 |
|
ooooo
|
56242920c4
|
test
|
2016-04-20 14:17:12 +08:00 |
|
leebaok
|
38379feb62
|
[network] check whether IP exists and whether IP out of pool range when releasing IP to user pool by deleting vclusters
|
2016-04-18 20:26:19 +08:00 |
|
ooooo
|
cd0df9847f
|
Merge branch 'master' of https://github.com/unias/docklet into separate
|
2016-04-18 18:18:36 +08:00 |
|
ooooo
|
e313f50b5e
|
add some comment
|
2016-04-18 18:16:19 +08:00 |
|
zhong yehong
|
eb6e0f4793
|
Merge pull request #63 from zhongyehong/ipdist
Ipdist
|
2016-04-18 11:00:58 +08:00 |