Merge "rebase onap oom to beijing release"
authorRuijing Guo <ruijing.guo@intel.com>
Thu, 5 Jul 2018 07:37:34 +0000 (07:37 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 5 Jul 2018 07:37:34 +0000 (07:37 +0000)

Trivial merge