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 |
|
zhongyh16
|
4e93b6d11a
|
Merge remote-tracking branch 'upstream/master'
|
2017-05-08 15:55:36 +08:00 |
|
zhongyh16
|
12bf36cb7a
|
fix a bug of waiting dead worker
|
2017-05-08 15:47:34 +08:00 |
|
Yujian Zhu
|
d2d4888d13
|
Merge pull request #225 from FirmlyReality/network
Replace worker_ip_required and master_ip_required with token_required
|
2017-05-07 16:30:23 +08:00 |
|
zhuyj17
|
b579016aba
|
Replace worker_ip_required and master_ip_required with token_required
|
2017-05-07 16:29:19 +08:00 |
|
zhongyh16
|
fdbde29934
|
modify the addcluster page
change the ttl of heartbeat
create a new rpc client when execute a rpc call
|
2017-05-07 15:47:21 +08:00 |
|
Yujian Zhu
|
38d036ac79
|
Merge pull request #224 from FirmlyReality/network
Fix a bug
|
2017-05-02 09:26:32 +08:00 |
|
zhuyj17
|
9652d2551f
|
Fix a bug
|
2017-05-02 09:23:36 +08:00 |
|
Yujian Zhu
|
eb55037eb3
|
Merge pull request #223 from FirmlyReality/network
Network
|
2017-05-02 00:00:04 +08:00 |
|
zhuyj17
|
b4834b2dd8
|
Fix some bugs.
|
2017-05-01 23:58:23 +08:00 |
|
zhuyj17
|
b38f611228
|
fix some bug
|
2017-04-30 17:57:34 +08:00 |
|
zhuyj17
|
a680f9a0d3
|
Let the system can change to non-distributed gateway smoothly.
|
2017-04-30 15:51:29 +08:00 |
|
zhuyj17
|
38854367ed
|
Change proxy url to let user can change distributed gateway to non-distributed.
|
2017-04-29 17:00:34 +08:00 |
|
zhuyj17
|
fe9fb6dee9
|
add docklet-user in reinit in docklet-supermaster
|
2017-04-29 11:06:52 +08:00 |
|
zhuyj17
|
a19eb9446b
|
Merge branch 'master' of https://github.com/unias/docklet into network
|
2017-04-29 09:46:58 +08:00 |
|
Yujian Zhu
|
8ef9b3647b
|
Merge pull request #222 from FirmlyReality/master
fix a bug in rpc
|
2017-04-25 13:15:20 +08:00 |
|
zhuyj17
|
53b904067a
|
fix a bug
|
2017-04-25 13:14:42 +08:00 |
|
Yujian Zhu
|
da64dc10a0
|
Merge pull request #221 from FirmlyReality/master
fix a rpc bug
|
2017-04-25 11:21:48 +08:00 |
|
zhuyj17
|
934c38b138
|
Merge branch 'master' of https://github.com/unias/docklet into network
|
2017-04-25 11:20:16 +08:00 |
|
zhuyj17
|
150bc4db75
|
fix a rpc bug
|
2017-04-25 11:18:30 +08:00 |
|
zhuyj17
|
94af46c740
|
edit supermaster
|
2017-04-25 08:22:34 +08:00 |
|
zhuyj17
|
6b1b96a95b
|
fix confilct
|
2017-04-25 08:17:34 +08:00 |
|
zhuyj17
|
ce655e42dc
|
add nginx to prepare.sh
|
2017-04-25 00:47:20 +08:00 |
|
zhuyj17
|
96ac04a529
|
fix a bug in docklet worker
|
2017-04-25 00:14:59 +08:00 |
|
zhuyj17
|
9aa2a47193
|
add nginx_config
|
2017-04-24 23:31:17 +08:00 |
|
zhuyj17
|
59aa00fcb3
|
edit proxy_url
|
2017-04-18 16:45:04 +08:00 |
|
zhuyj17
|
468adef76a
|
save usrgw in etcd
|
2017-04-18 01:27:50 +08:00 |
|
zhuyj17
|
84b12317a1
|
remember proxy_server_ip as the usergateway
|
2017-04-18 00:52:59 +08:00 |
|
zhong yehong
|
aeeaa1593a
|
Merge pull request #220 from zhongyehong/master
add external login
|
2017-04-17 15:27:48 +08:00 |
|
zhongyh16
|
1a5de0fa8c
|
add external login
|
2017-04-17 15:26:46 +08:00 |
|
zhong yehong
|
a43e34f954
|
Merge pull request #219 from zhongyehong/master
add external_login url
|
2017-04-17 13:23:29 +08:00 |
|
zhongyh16
|
1bab7f93cd
|
add external_login url
|
2017-04-17 13:22:13 +08:00 |
|
zhong yehong
|
327f542526
|
Merge pull request #218 from ghostplant/master
prevent fork bomb
|
2017-04-14 13:30:06 +08:00 |
|
CUI Wei
|
1b9be197b4
|
prevent fork bomb
|
2017-04-12 12:24:04 +08:00 |
|
zhuyj17
|
94d2028986
|
add nginx proxy
|
2017-04-11 07:56:55 +08:00 |
|
zhong yehong
|
1cd74e1d34
|
Merge pull request #217 from zhongyehong/master
mutiple master
|
2017-04-10 16:15:22 +08:00 |
|
zhongyh16
|
fb78cdff48
|
fix a billing bug
|
2017-04-10 16:06:11 +08:00 |
|
zhongyh16
|
8458d41bd8
|
stop debug mode
|
2017-04-10 15:27:41 +08:00 |