From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 16 Nov 2016 18:33:58 +0000 (+0000)
Subject: Merge "Prepare 6.0.0 (ocata-1)"
X-Git-Tag: opnfv-6.0.0~480
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a63f799dbfb1a6cabb1ec18d929fa682fbf30289;p=apex-puppet-tripleo.git

Merge "Prepare 6.0.0 (ocata-1)"
---

a63f799dbfb1a6cabb1ec18d929fa682fbf30289