zhongyh16
|
951f45c63b
|
add clean-usage
fix the bug of usage release
change the interval and the logic of heartbeart
|
2017-05-16 17:48:25 +08:00 |
|
Yujian Zhu
|
64cd79e680
|
Merge pull request #242 from FirmlyReality/master
update baseurl and proxy_url when change from distributed gateway to non-distributed gateway
|
2017-05-16 17:02:01 +08:00 |
|
zhuyj17
|
986f0ee243
|
update proxy_url
|
2017-05-16 16:59:48 +08:00 |
|
zhuyj17
|
92f15b26be
|
update baseurl when change from distributed gateway to non-distributed gateway
|
2017-05-16 16:33:22 +08:00 |
|
Yujian Zhu
|
27df72e59e
|
Merge pull request #241 from FirmlyReality/master
add usrgws when user has been existed
|
2017-05-16 15:32:15 +08:00 |
|
zhuyj17
|
fa5ce9e636
|
add usrgws when user has been existed
|
2017-05-16 15:30:50 +08:00 |
|
zhuyj17
|
a18398dfb6
|
add a script to update network in container config
|
2017-05-16 11:15:23 +08:00 |
|
zhuyj17
|
08c5c780c0
|
change network config in container.conf
|
2017-05-16 10:10:09 +08:00 |
|
zhuyj17
|
e3cb5c63a3
|
fix conflict
|
2017-05-16 09:15:45 +08:00 |
|
Yujian Zhu
|
c146248a58
|
Merge pull request #240 from FirmlyReality/master
add if status in usrgw
|
2017-05-16 09:11:52 +08:00 |
|
zhuyj17
|
e7edb1024d
|
add if status in usrgw
|
2017-05-16 09:10:14 +08:00 |
|
Yujian Zhu
|
3a25964b0b
|
Merge pull request #239 from FirmlyReality/master
remove in nginx_docklet.conf when nginx_port=80
|
2017-05-16 00:46:49 +08:00 |
|
zhuyj17
|
0b2c408349
|
remove in nginx_docklet.conf when nginx_port=80
|
2017-05-16 00:45:46 +08:00 |
|
Yujian Zhu
|
787e95ef5f
|
Merge pull request #238 from FirmlyReality/master
add self to write_clusterinfo
|
2017-05-15 23:59:20 +08:00 |
|
zhuyj17
|
8b992483cb
|
add self to write_clusterinfo
|
2017-05-15 23:58:35 +08:00 |
|
Yujian Zhu
|
e84a7e35aa
|
Merge pull request #237 from FirmlyReality/master
1.check usrgw when call has_user. 2.update base_url in container
|
2017-05-15 23:39:11 +08:00 |
|
zhuyj17
|
9eced464fd
|
1.check usrgw when call has_user. 2.update base_url in container
|
2017-05-15 23:37:07 +08:00 |
|
zhong yehong
|
04f6c9c923
|
Merge pull request #236 from zhongyehong/master
fix a bug of user directory not exists
|
2017-05-15 17:31:02 +08:00 |
|
zhongyh16
|
90d8098849
|
fix a bug of user directory not exists
|
2017-05-15 17:29:46 +08:00 |
|
zhongyh16
|
6590458591
|
fix a bug when user directory not exists
|
2017-05-15 17:24:31 +08:00 |
|
zhong yehong
|
b0c7d91e72
|
Merge pull request #235 from zhongyehong/master
update etcd-multi-nodes.sh
|
2017-05-15 16:17:42 +08:00 |
|
zhongyh16
|
1f38e62421
|
update etcd-multi-nodes.sh
|
2017-05-15 16:16:15 +08:00 |
|
zhong yehong
|
59f8738bd5
|
Merge pull request #234 from zhongyehong/master
update etcd-multi-nodes.sh
|
2017-05-15 16:04:21 +08:00 |
|
zhongyh16
|
2d51406fdd
|
update etcd-multi-nodes.sh
|
2017-05-15 15:26:25 +08:00 |
|
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 |