Merge "Fix a potential infinite loop and a bug"
authorRuan HE <ruan.he@orange.com>
Wed, 3 Jan 2018 13:26:30 +0000 (13:26 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 3 Jan 2018 13:26:30 +0000 (13:26 +0000)

Trivial merge