Merge "content Alarm function modification"
authorTao Shen <shentao@chinamobile.com>
Tue, 23 Oct 2018 21:04:32 +0000 (21:04 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 23 Oct 2018 21:04:32 +0000 (21:04 +0000)

Trivial merge