From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 15 Jul 2015 11:41:48 +0000 (+0000)
Subject: Merge "Removes the NeutronScale resource from controller pcmk manifest"
X-Git-Tag: opnfv-6.0.0~2440
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2b40e39a9b9c79a026c4601620e9d0b383b1cb12;p=apex-tripleo-heat-templates.git

Merge "Removes the NeutronScale resource from controller pcmk manifest"
---

2b40e39a9b9c79a026c4601620e9d0b383b1cb12