Merge "Create new consolidated documentation for JOID"
authorNarinder Gupta <narinder.gupta@canonical.com>
Fri, 25 Aug 2017 18:47:29 +0000 (18:47 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 25 Aug 2017 18:47:29 +0000 (18:47 +0000)

Trivial merge