Merge "Add aodh default user for apex" into stable/brahmaputra
authorMorgan Richomme <morgan.richomme@orange.com>
Mon, 1 Feb 2016 13:49:38 +0000 (13:49 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 1 Feb 2016 13:49:38 +0000 (13:49 +0000)

Trivial merge