From: Oleh Prypin <oleh@pryp.in>
Date: Thu, 9 Jun 2016 12:40:26 +0000 (+0300)
Subject: Merge branch 'master' into RM-15016
X-Git-Tag: v1.5.35~10^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=128e5b36444ade745d31a65eb40aec18343207c6;p=ceph-deploy.git

Merge branch 'master' into RM-15016
---

128e5b36444ade745d31a65eb40aec18343207c6