Merge "Rebase to fuel 10.0 for fuel@opnfv D release"
authorMaryam Tahhan <maryam.tahhan@intel.com>
Wed, 23 Nov 2016 09:04:05 +0000 (09:04 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 23 Nov 2016 09:04:05 +0000 (09:04 +0000)

Trivial merge