From: Alfredo Deza <alfredo@deza.pe>
Date: Tue, 14 Jul 2015 18:17:44 +0000 (-0400)
Subject: Merge pull request #325 from trhoden/RM-12330
X-Git-Tag: v1.5.26~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fba67e7b4e50ac65f1443238db964fb8841559bd;p=ceph-deploy.git

Merge pull request #325 from trhoden/RM-12330

[RM-12330] Pin mock version to work on Python 2.6
---

fba67e7b4e50ac65f1443238db964fb8841559bd