From: chenshuai@huawei.com Date: Mon, 4 Jan 2016 15:14:31 +0000 (+0000) Subject: Merge "bugfix: annotate the code in annotation in haproxy.cfg.j2" X-Git-Tag: brahmaputra.1.0~83 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5361c1204f65e51c624433fcff65a6d985cc352a;p=compass4nfv.git Merge "bugfix: annotate the code in annotation in haproxy.cfg.j2" --- 5361c1204f65e51c624433fcff65a6d985cc352a