zhongyehong
|
c3ecd0d2a0
|
Merge remote-tracking branch 'upstream/master'
|
2016-04-11 14:37:42 +08:00 |
|
zhuyj17
|
02cbccdd15
|
Set quota in etcd and read from etcd for each container.
|
2016-04-11 12:17:06 +08:00 |
|
zhuyj17
|
5bdf6f1404
|
Fix minus quota bug
|
2016-04-11 11:39:58 +08:00 |
|
leebaok
|
21d10f1650
|
Merge pull request #37 from FirmlyReality/quotabug
Fix quota bug. Now quota will be read from groupinfo.
|
2016-04-11 10:01:04 +08:00 |
|
zhuyj17
|
8e091a5dfc
|
Fix quota bug. Now quota will be read from groupinfo.
|
2016-04-10 20:12:48 +08:00 |
|
zhong yehong
|
990721be17
|
Merge pull request #36 from zhongyehong/nfsbug
fix mismatching of nfs mountpoint #35
|
2016-04-10 12:54:53 +08:00 |
|
zhongyehong
|
bf3eb91c27
|
fix mismatching of nfs mountpoint #35
|
2016-04-10 12:52:03 +08:00 |
|
Cao, Donggang
|
4b8fc51a57
|
Merge pull request #34 from caodg/updateconf
update readme
|
2016-04-08 15:55:25 +08:00 |
|
Donggang Cao
|
d0b8b9e7f5
|
Merge remote-tracking branch 'upstream/master' into updateconf
|
2016-04-08 15:49:02 +08:00 |
|
Donggang Cao
|
c7536c9116
|
update README
|
2016-04-08 15:48:37 +08:00 |
|
zhongyehong
|
9437ae4447
|
move sys_run code to try block #18
use sys_run instead of self.sys_call in imagemgr.py
|
2016-04-08 15:41:56 +08:00 |
|
Cao, Donggang
|
28f577ecb1
|
Merge pull request #33 from caodg/updateconf
deprecate some configs
|
2016-04-08 15:17:16 +08:00 |
|
Donggang Cao
|
ad36403d0d
|
deprecate some configs
|
2016-04-08 15:11:57 +08:00 |
|
zhong yehong
|
2b747f9b9a
|
Merge pull request #32 from zhongyehong/adminpage
Adminpage
|
2016-04-08 13:54:29 +08:00 |
|
zhongyehong
|
545a644f9a
|
Merge remote-tracking branch 'upstream/master' into adminpage
|
2016-04-08 13:48:52 +08:00 |
|
zhongyehong
|
6e0998e2d7
|
fix button in admin page #6
add breadcrumb
|
2016-04-08 13:39:36 +08:00 |
|
leebaok
|
aed61947b0
|
Merge pull request #31 from leebaok/bug-append-lxc.custom.conf-to-container.conf
[lxc.custom.conf] support lxc.custom.conf in appending mode
|
2016-04-07 16:48:31 +08:00 |
|
leebaok
|
c3134256cf
|
[lxc.custom.conf] support lxc.custom.conf in appending mode
|
2016-04-07 16:44:27 +08:00 |
|
leebaok
|
c02d279090
|
Merge pull request #29 from leebaok/bug-lxc-config-item-length-limit
use clusterid-containerid as container's veth.pair name
|
2016-04-07 15:41:37 +08:00 |
|
leebaok
|
c4f1a1c041
|
[bug] use clusterid-containerid as container's veth.pair name
because lxc config item length limit in 16 bytes
|
2016-04-07 15:23:27 +08:00 |
|
zhong yehong
|
51b1fda651
|
Merge pull request #27 from zhongyehong/adminpage
Adminpage
|
2016-04-06 17:34:18 +08:00 |
|
leebaok
|
1a10b6e13f
|
Merge pull request #26 from leebaok/bug-external-login
[external login] bug of external login failed
|
2016-04-06 17:27:14 +08:00 |
|
zhong
|
32d56db3a6
|
remove some useless notes
|
2016-04-06 17:22:06 +08:00 |
|
leebaok
|
3c905af403
|
[external login] bug of external login failed
|
2016-04-06 17:18:47 +08:00 |
|
zhong
|
5c489cb7a6
|
Merge remote-tracking branch 'upstream/master' into adminpage
|
2016-04-06 17:07:10 +08:00 |
|
leebaok
|
4b4a1fd455
|
Merge pull request #24 from leebaok/lxcfs
[lxcfs] add lxcfs support for docklet
|
2016-04-06 14:54:24 +08:00 |
|
leebaok
|
2b289499a3
|
[lxcfs] add lxcfs support for docklet
|
2016-04-06 14:47:16 +08:00 |
|
zhong
|
d409d2358e
|
can remove quota group from web page
can add quota with just one click
|
2016-04-06 14:43:16 +08:00 |
|
zhong
|
402fcf8c91
|
Merge remote-tracking branch 'upstream/master' into adminpage
|
2016-04-06 13:42:05 +08:00 |
|
zhong yehong
|
d14bda426b
|
Merge pull request #22 from zhongyehong/proxybug
fix bug in proxy port #4
|
2016-04-06 13:40:59 +08:00 |
|
zhong
|
8853435ba5
|
fix bug in proxy port #4
|
2016-04-06 12:59:29 +08:00 |
|
leebaok
|
fa56ab7ab3
|
Merge pull request #21 from zhongyehong/stopbug
Stopbug
|
2016-04-06 11:00:27 +08:00 |
|
zhong
|
6a438d1444
|
Merge remote-tracking branch 'upstream/master' into stopbug
|
2016-04-06 10:39:58 +08:00 |
|
zhong
|
4d46f06c73
|
fix bug of stop container #14
|
2016-04-06 10:37:50 +08:00 |
|
leebaok
|
45fa4658e7
|
[develop guide] update dev guide doc
|
2016-04-05 20:19:03 +08:00 |
|
leebaok
|
377c09ec81
|
Merge pull request #13 from PedroLiu/modified-log
Will not log user's password now
|
2016-04-05 18:31:19 +08:00 |
|
leebaok
|
dae5d3874f
|
Merge pull request #15 from FirmlyReality/display_quota
Display quota in Status page.
|
2016-04-05 18:30:52 +08:00 |
|
zhuyj17
|
3aa87cf858
|
Display quota in Status page.
|
2016-04-05 17:41:43 +08:00 |
|
zhong
|
08df8532b2
|
move quota group from database to json file
|
2016-04-05 17:36:39 +08:00 |
|
Peidong Liu
|
abb6f716b2
|
Will not log user's password now
|
2016-04-05 16:59:27 +08:00 |
|
leebaok
|
69e34f87b1
|
Merge pull request #11 from leebaok/dev-guide
[develop guide] add devguide
|
2016-04-05 00:27:49 +08:00 |
|
leebaok
|
edfca93719
|
[develop guide] add devguide
|
2016-04-05 00:25:00 +08:00 |
|
leebaok
|
95593d17f2
|
Merge pull request #10 from PedroLiu/Profile-Button-and-refreshinfo
user info refreshing and button background color changing
|
2016-04-04 22:27:09 +08:00 |
|
Peidong Liu
|
e9dfd7b395
|
Now updating userinfo take effects immediately
Change background color of profile and signout button
|
2016-04-04 21:13:19 +08:00 |
|
leebaok
|
1936fb6ce4
|
hot fix of external login of web
|
2016-04-01 19:30:55 +08:00 |
|
Cao, Donggang
|
7895d7a60f
|
Merge pull request #2 from scorpionis/master
fix and modify some documents
|
2016-04-01 10:51:46 +01:00 |
|
leebaok
|
405d12cce1
|
Merge pull request #1 from caodg/master
update readme
|
2016-03-31 17:36:36 +08:00 |
 Donggang Cao
|
de92bbc3f6
|
update readme
|
2016-03-31 10:21:56 +01:00 |
|
leebaok
|
66906a1424
|
[Init] init repository with Docklet 0.2.6
|
2016-03-31 16:03:38 +08:00 |
|
scorpionis
|
24a97173cd
|
fix and modify some documents
|
2016-03-23 08:14:21 +08:00 |