Merge "Watchdog timer too short in oom override.yaml"
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>
Fri, 28 Sep 2018 15:57:52 +0000 (15:57 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 28 Sep 2018 15:57:52 +0000 (15:57 +0000)

Trivial merge