Merge "bugfix: annotate the code in annotation in haproxy.cfg.j2"
authorchenshuai@huawei.com <chenshuai@huawei.com>
Mon, 4 Jan 2016 15:14:31 +0000 (15:14 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 4 Jan 2016 15:14:31 +0000 (15:14 +0000)

Trivial merge