From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 6 Jan 2016 12:18:31 +0000 (+0000)
Subject: Merge "Bump the pacemaker service op_params to 200s for start and stop"
X-Git-Tag: opnfv-6.0.0~2237
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=dccf97a000af99a2d76f9a5d4cc5f3d024b50693;p=apex-tripleo-heat-templates.git

Merge "Bump the pacemaker service op_params to 200s for start and stop"
---

dccf97a000af99a2d76f9a5d4cc5f3d024b50693