Merge "GENERIC-RESOURCE-API template fixes"
authorMarcus Williams <marcus.williams@intel.com>
Mon, 30 Oct 2017 19:23:47 +0000 (19:23 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 30 Oct 2017 19:23:47 +0000 (19:23 +0000)
commitdacfab59cf41eaf95b3a87ec48124a1a51a21df7
tree3b25374c4d8016cfc85f9c3435c7512128784d67
parent95fb049d01e6193782a78cd3a9bd7f914a7cb11f
parent276eaa580a8e67edaa50547c71c7d389d23d8324
Merge "GENERIC-RESOURCE-API template fixes"

Former-commit-id: b762951427de965aac2461d99017714f74b5fa15