Merge "add ping6 parameters" into stable/colorado
authorliang gao <jean.gaoliang@huawei.com>
Wed, 21 Sep 2016 07:22:41 +0000 (07:22 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 21 Sep 2016 07:22:42 +0000 (07:22 +0000)

Trivial merge