ops / yoho-ansible-roles · Commits

Go to a project

Authored by chunhua.zhang
Commit 8a2577f05f946d0abb8c5995e8e20cd46a5b4dce 2 parents 14514b25 1e96b2f0

Merge branch 'master' of git.yoho.cn:ops/yoho-ansible-roles 

* 'master' of git.yoho.cn:ops/yoho-ansible-roles:
  Update redirect.lua

# Conflicts:
#	roles/openresty/files/java-nginx-config/nginx/conf/redirect.lua
Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
... ... @@ -114,4 +114,5 @@ function main()
end
end
\ No newline at end of file
------ run -------
main()
\ No newline at end of file
... ...