From: iberezovskiy <iberezovskiy@mirantis.com>
Date: Wed, 7 Oct 2015 16:06:59 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into mos-8.0
X-Git-Tag: 7.0.0-mos-rc2^0
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=853419475b6bfffd7b0522f5092af6e95c63abff;p=puppet-modules%2Fpuppet-ceilometer.git

Merge remote-tracking branch 'origin/master' into mos-8.0


Change-Id: I04643d15a2ad08d792b4260a07ab4ccba679989a
---

853419475b6bfffd7b0522f5092af6e95c63abff