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
..
annotations	[ADD] location proxy	2019-03-10 18:51:10 +08:00
controller	Merge branch 'master' into cfg	2019-03-10 19:06:06 +08:00
defaults	[ADD] location proxy	2019-03-10 18:51:10 +08:00
metric	[REV] test change code for gateway monitor	2019-03-08 15:09:09 +08:00
store	Merge branch 'master' into cfg	2019-03-10 19:06:06 +08:00
test	[ADD] location proxy	2019-03-10 18:51:10 +08:00
util	[FIX] fix bug: invalid number of arguments in "proxy_pass"	2018-12-29 14:56:07 +08:00
v1	Merge branch 'master' into cfg	2019-03-10 19:06:06 +08:00