Merge "add server_option in haproxy configuration"
authorDavid Blaisonneau <david.blaisonneau@orange.com>
Tue, 23 Aug 2016 09:41:00 +0000 (09:41 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 23 Aug 2016 09:41:00 +0000 (09:41 +0000)

Trivial merge