huangrh b6bb182f62 Merge branch 'master' into cfg ... # Conflicts: # gateway/controller/openresty/model/server.go # gateway/controller/openresty/rbd_endpoints.go # gateway/controller/openresty/service.go # gateway/controller/openresty/template/template.go # hack/contrib/docker/gateway/nginxtmp/servers.tmpl		2019-03-10 19:06:06 +08:00
..
model	Merge branch 'master' into cfg	2019-03-10 19:06:06 +08:00
template	Merge branch 'master' into cfg	2019-03-10 19:06:06 +08:00
checker.go	[REV] test change code for gateway monitor	2019-03-08 15:09:09 +08:00
nginx_cmd.go	[ADD] add health check	2018-12-05 22:06:21 +08:00
openresty.go	[ADD] init gateway struct code	2018-10-10 14:40:11 +08:00
rbd_endpoints.go	Merge branch 'master' into cfg	2019-03-10 19:06:06 +08:00
service.go	Merge branch 'master' into cfg	2019-03-10 19:06:06 +08:00