Merge "Exceptions"
authorLuke Hinds <lhinds@redhat.com>
Thu, 13 Jul 2017 08:54:05 +0000 (08:54 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 13 Jul 2017 08:54:05 +0000 (08:54 +0000)

Trivial merge