-
* 'master' of git.yoho.cn:ops/yoho-ansible-roles: Update redirect.lua # Conflicts: # roles/openresty/files/java-nginx-config/nginx/conf/redirect.lua
* 'master' of git.yoho.cn:ops/yoho-ansible-roles: Update redirect.lua # Conflicts: # roles/openresty/files/java-nginx-config/nginx/conf/redirect.lua