Merge "Add cadi.properties for AAF OOM support"
authorAlexis de Talhouët <alexis.de_talhouet@bell.ca>
Wed, 31 Oct 2018 13:53:17 +0000 (13:53 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 31 Oct 2018 13:53:17 +0000 (13:53 +0000)

Trivial merge