zhong yehong
|
eb6e0f4793
|
Merge pull request #63 from zhongyehong/ipdist
Ipdist
|
2016-04-18 11:00:58 +08:00 |
|
zhongyehong
|
3fa04c95b9
|
Merge remote-tracking branch 'upstream/master' into ipdist
|
2016-04-18 10:54:50 +08:00 |
|
zhongyehong
|
9fd85a54f7
|
clean nfs when guest restart
|
2016-04-18 10:54:21 +08:00 |
|
zhongyehong
|
e30d912498
|
init shared_vlanids when start master without this key in etcd
update R and python demo for basefs
|
2016-04-18 10:39:24 +08:00 |
|
leebaok
|
d91978b1e1
|
Merge pull request #62 from leebaok/master
fix quota info failed
#62
|
2016-04-18 10:36:42 +08:00 |
|
leebaok
|
898aad3229
|
fix quota info failed
|
2016-04-18 10:35:04 +08:00 |
|
PedroLiu
|
1f29075caa
|
Merge pull request #60 from PedroLiu/master
2 enhancements
|
2016-04-18 10:33:07 +08:00 |
|
Peidong Liu
|
9ec437c27a
|
Now token will expires in 3600s
Now workspace name will be checked, if not correct, flask will raise a 500 error
|
2016-04-18 10:28:26 +08:00 |
|
leebaok
|
04e04c8a94
|
Merge pull request #59 from FirmlyReality/statusbug
Fix a bug of status page.
|
2016-04-18 09:11:38 +08:00 |
|
zhuyj17
|
4000d4f9d6
|
Fix a bug of status page.
|
2016-04-18 01:36:00 +08:00 |
|
leebaok
|
471a7a80a4
|
Merge pull request #58 from leebaok/homepage-v2
[home page] new home page of docklet
|
2016-04-17 15:00:43 +08:00 |
|
leebaok
|
534b34b1f7
|
[home page] new home page of docklet
|
2016-04-17 14:55:00 +08:00 |
|
Cao, Donggang
|
473eb450d6
|
Merge pull request #56 from FirmlyReality/displayquota
Displayquota
|
2016-04-16 06:31:24 +08:00 |
|
zhuyj17
|
55bc81e816
|
Add hours to idletime.
|
2016-04-15 23:36:57 +08:00 |
|
zhuyj17
|
5f5ee95f8c
|
Merge branch 'master' into displayquota
|
2016-04-15 23:33:35 +08:00 |
|
zhong yehong
|
d9226b035d
|
Merge pull request #53 from zhongyehong/ipdist
Ipdist
|
2016-04-14 17:30:30 +08:00 |
|
zhongyehong
|
7cd40a48e0
|
fix a bug when create guest #49
add hint for quota #7
|
2016-04-14 17:26:30 +08:00 |
|
zhongyehong
|
a55fcba862
|
the user in fundation group share vlanid #51
|
2016-04-14 16:32:50 +08:00 |
|
zhuyj17
|
9bdd012bd0
|
Add a table in status page to display user's quotas.
|
2016-04-14 15:52:44 +08:00 |
|
PedroLiu
|
8c20111d20
|
Merge pull request #47 from PedroLiu/master
Fix a bug that will lead to error when external_login() is called
|
2016-04-13 14:47:53 +08:00 |
|
Peidong Liu
|
c4dae009a3
|
Fix a bug that will lead to error when external_login() is called
|
2016-04-13 14:30:44 +08:00 |
|
zhong yehong
|
ce0d18a8df
|
Merge pull request #46 from zhongyehong/quotaadd
Quotaadd
|
2016-04-12 18:15:13 +08:00 |
|
zhongyehong
|
5511e92ab2
|
Merge remote-tracking branch 'upstream/master' into quotaadd
|
2016-04-12 18:12:54 +08:00 |
|
zhongyehong
|
be05b079c1
|
make image quota come true,
fix display bug of label,
rename some quota,
|
2016-04-12 18:11:34 +08:00 |
|
zhongyehong
|
b1680681ae
|
fix label display error, fix some bug on web
|
2016-04-12 15:20:11 +08:00 |
|
zhongyehong
|
fd120f4232
|
add disk quota, add button on adminpage to add quota #7
move system data to global/sys #41
|
2016-04-12 15:03:00 +08:00 |
|
Cao, Donggang
|
664a73ac23
|
Merge pull request #45 from caodg/master
add two scripts for starting and stoping spark cluster
|
2016-04-11 22:38:57 +08:00 |
|
Donggang Cao
|
60db552245
|
add two scripts for starting and stoping spark, should run update-basefs.sh to update
|
2016-04-11 10:31:05 -04:00 |
|
Cao, Donggang
|
d30d22861d
|
Merge pull request #44 from caodg/master
add USER/.ssh/config to disable StrictHostKeyChecking
|
2016-04-11 21:48:07 +08:00 |
 Donggang Cao
|
6963dd836d
|
add USER/.ssh/config to disable StrictHostKeyChecking
|
2016-04-11 09:39:25 -04:00 |
|
zhong yehong
|
62a2b86e34
|
Merge pull request #40 from zhongyehong/master
mount tmp from host #39 move sys_run code to try block #18
|
2016-04-11 15:06:02 +08:00 |
|
zhongyehong
|
354ad95d77
|
mount tmp from host #39
|
2016-04-11 15:03:09 +08:00 |
|
zhongyehong
|
99a8bcb07f
|
Merge remote-tracking branch 'upstream/master'
|
2016-04-11 15:00:48 +08:00 |
|
zhong yehong
|
9f83324dce
|
Merge pull request #38 from FirmlyReality/minusbug
Minusbug
|
2016-04-11 14:58:41 +08:00 |
|
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 |