From: iberezovskiy <iberezovskiy@mirantis.com>
Date: Thu, 17 Sep 2015 10:57:23 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into HEAD
X-Git-Tag: 7.0.0-mos-rc1^0
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F82%2F11682%2F1;p=puppet-modules%2Fpuppet-ceilometer.git

Merge remote-tracking branch 'origin/master' into HEAD

Change-Id: I9b93ab34a9705471048a4d2212f02b9c425c21b0
---

df9e83b87754ab8867c09051756fe5afdecf4781