From: Marcus Williams <marcus.williams@intel.com>
Date: Mon, 30 Oct 2017 19:23:47 +0000 (+0000)
Subject: Merge "GENERIC-RESOURCE-API template fixes"
X-Git-Tag: v1.2.1~61
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dacfab59cf41eaf95b3a87ec48124a1a51a21df7;p=sdnc%2Foam.git

Merge "GENERIC-RESOURCE-API template fixes"

Former-commit-id: b762951427de965aac2461d99017714f74b5fa15
---

dacfab59cf41eaf95b3a87ec48124a1a51a21df7