From: Jenkins Date: Tue, 5 Jul 2016 17:48:03 +0000 (+0000) Subject: Merge "pacemaker: don't override Service resource for Nova & Neutron" X-Git-Tag: opnfv-6.0.0~1885 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8b332b088c5f63659296aa0cc46361d27b1666d7;p=apex-tripleo-heat-templates.git Merge "pacemaker: don't override Service resource for Nova & Neutron" --- 8b332b088c5f63659296aa0cc46361d27b1666d7