Merge "Update VimID in grant interface as optional"

author Yan Yang <yangyanyj@chinamobile.com>

Thu, 26 Jul 2018 01:11:02 +0000 (01:11 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Thu, 26 Jul 2018 01:11:02 +0000 (01:11 +0000)
author Yan Yang <yangyanyj@chinamobile.com>
Thu, 26 Jul 2018 01:11:02 +0000 (01:11 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Thu, 26 Jul 2018 01:11:02 +0000 (01:11 +0000)
diff --cc ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java
Simple merge
author	Yan Yang <yangyanyj@chinamobile.com>
	Thu, 26 Jul 2018 01:11:02 +0000 (01:11 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Thu, 26 Jul 2018 01:11:02 +0000 (01:11 +0000)