zhong yehong
|
264d7c79a6
|
Merge pull request #233 from zhongyehong/master
change the interval of heartbeat function
|
2017-05-15 13:26:35 +08:00 |
|
zhongyh16
|
d23005569a
|
change the interval of heartbeat function
|
2017-05-15 13:23:37 +08:00 |
|
zhuyj17
|
eb7e5f826f
|
recover usernet when recovering cluster
|
2017-05-11 17:24:44 +08:00 |
|
Yujian Zhu
|
54a89deeea
|
Merge pull request #232 from FirmlyReality/master
Add proxy_server_ip when create container in scale out cluster
|
2017-05-10 18:47:55 +08:00 |
|
zhuyj17
|
8c658e9b56
|
Add proxy_server_ip when create container in scale out cluster
|
2017-05-10 18:43:55 +08:00 |
|
zhuyj17
|
0b733b79f5
|
add some comment
|
2017-05-10 18:40:59 +08:00 |
|
zhuyj17
|
a1295519f8
|
Remove vlan and delete existing network when starting.
|
2017-05-10 17:38:31 +08:00 |
|
zhuyj17
|
f9ac5106cc
|
Remove GRE
|
2017-05-09 15:35:31 +08:00 |
|
zhuyj17
|
c2d1d6e124
|
start user before master in supermaster
|
2017-05-09 10:03:24 +08:00 |
|
zhuyj17
|
8400845dce
|
fix a bug
|
2017-05-09 09:24:46 +08:00 |
|
zhuyj17
|
e8269cc756
|
remove vlanid in usergw
|
2017-05-09 09:20:34 +08:00 |
|
zhuyj17
|
9839097b5c
|
fix some bugs
|
2017-05-09 01:31:21 +08:00 |
|
PedroLiu
|
1e2a7528d6
|
Merge pull request #231 from PedroLiu/master
Fix a bug that only root's info can be modified in /user/list
|
2017-05-09 01:20:13 +08:00 |
|
Peidong Liu
|
19ee71d35e
|
use settings.get('E_MAIL_FROM_ADDRESS') to get e-mail address
|
2017-05-09 01:18:37 +08:00 |
|
Peidong Liu
|
719ff951b4
|
fix a bug that only root's info can be modified in /user/list
|
2017-05-09 01:16:22 +08:00 |
|
zhuyj17
|
1148f766e5
|
add vxlan support
|
2017-05-09 01:06:39 +08:00 |
|
Yujian Zhu
|
3c971b3bc1
|
Merge pull request #230 from FirmlyReality/network
Fix some bugs.
|
2017-05-08 17:58:04 +08:00 |
|
zhuyj17
|
5a1d960134
|
Merge branch 'master' of https://github.com/unias/docklet into network
|
2017-05-08 17:55:47 +08:00 |
|
zhuyj17
|
0b6df0f1ad
|
Add Auth_token
|
2017-05-08 17:55:30 +08:00 |
|
PedroLiu
|
d7406f5ed3
|
Merge pull request #228 from PedroLiu/master
Add settings and logs panel
|
2017-05-08 17:12:23 +08:00 |
|
Peidong Liu
|
8ce97824a4
|
Merge branch 'master' of https://github.com/PedroLiu/docklet
|
2017-05-08 17:08:25 +08:00 |
|
Peidong Liu
|
236081e5af
|
fix another bug
|
2017-05-08 17:01:57 +08:00 |
|
Peidong Liu
|
3551b9e524
|
fix some bugs when merging
|
2017-05-08 16:55:20 +08:00 |
|
Peidong Liu
|
00761061d4
|
merge my own branches & fix some bugs
|
2017-05-08 16:53:49 +08:00 |
|
Peidong Liu
|
8986dbff57
|
change the time of reading e-mail address
|
2017-05-08 16:53:30 +08:00 |
|
zhuyj17
|
7b08e78cb9
|
fix some bug
|
2017-05-08 16:52:30 +08:00 |
|
zhuyj17
|
c0709ae9e1
|
Change proxy url to let user can change distributed gateway to non-distributed.
|
2017-05-08 16:51:45 +08:00 |
|
zhuyj17
|
83cba290b4
|
fix a bug in docklet worker
|
2017-05-08 16:50:29 +08:00 |
|
zhuyj17
|
1d411b0745
|
add nginx_config
|
2017-05-08 16:50:29 +08:00 |
|
zhuyj17
|
546c4b3608
|
edit proxy_url
|
2017-05-08 16:48:43 +08:00 |
|
zhuyj17
|
9db6e3effd
|
save usrgw in etcd
|
2017-05-08 16:47:46 +08:00 |
|
zhuyj17
|
deafc07f39
|
remember proxy_server_ip as the usergateway
|
2017-05-08 16:47:13 +08:00 |
|
zhuyj17
|
1d1262a70d
|
add nginx proxy
|
2017-05-08 16:46:32 +08:00 |
|
zhongyh16
|
5e8901729f
|
fix a billing bug
|
2017-05-08 16:45:32 +08:00 |
|
zhongyh16
|
01ff009ca2
|
stop debug mode
|
2017-05-08 16:44:32 +08:00 |
|
zhongyh16
|
603aed50c3
|
fix a bug
|
2017-05-08 16:42:57 +08:00 |
|
zhongyh16
|
375abd85b7
|
monitor part of multiple master
|
2017-05-08 16:42:57 +08:00 |
|
zhongyh16
|
3b17bd33a3
|
multiple master
|
2017-05-08 16:40:31 +08:00 |
|
zhuyj17
|
76dc8754e2
|
Merge branch 'master' of https://github.com/unias/docklet into network
|
2017-05-08 16:40:13 +08:00 |
|
zhuyj17
|
dbb76a29ca
|
Add proxy_server_ip to info.keys
|
2017-05-08 16:40:01 +08:00 |
|
zhong yehong
|
384d1dc854
|
Merge pull request #227 from zhongyehong/master
fix some bug in rpc call
|
2017-05-08 16:38:45 +08:00 |
|
zhongyh16
|
ecdaa8584b
|
fix some bug in rpc call
|
2017-05-08 16:36:20 +08:00 |
|
zhuyj17
|
0512f442bf
|
Set proxy route by rpc.
|
2017-05-08 16:32:39 +08:00 |
|
zhuyj17
|
b342a996b6
|
check_gw by rpc
|
2017-05-08 16:29:40 +08:00 |
|
zhuyj17
|
ef61a462c8
|
Enable user gateway to be set up on the worker.
|
2017-05-08 16:29:01 +08:00 |
|
zhuyj17
|
f63355682d
|
Seperate monitor from users' databases.
|
2017-05-08 16:27:24 +08:00 |
|
zhongyehong
|
0fd1e571c2
|
change the user module to an independent http server.
|
2017-05-08 16:26:08 +08:00 |
|
Peidong Liu
|
d37e2e066a
|
change the time of reading e-mail address
|
2017-05-08 16:22:30 +08:00 |
|
zhong yehong
|
ff1c562b79
|
Merge pull request #226 from zhongyehong/master
rpc
|
2017-05-08 16:14:38 +08:00 |
|
zhongyh16
|
11dde65e3b
|
fix a bug of path in shell script
|
2017-05-08 16:11:47 +08:00 |