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)
commit5361c1204f65e51c624433fcff65a6d985cc352a
treea0be641e24af3237354abbe2a871002073411b75
parentfd84ea047b0d05d7f7ad54a486944a2f57826364
parenta44775fe72cd0e48b85e80265b04750ae82ce355
Merge "bugfix: annotate the code in annotation in haproxy.cfg.j2"