From: Jenkins <jenkins@inktank.com>
Date: Fri, 27 Feb 2015 21:21:03 +0000 (-0800)
Subject: Merge branch 'hammer' of jenkins.front.sepia.ceph.com:ceph/ceph into hammer
X-Git-Tag: v0.94~70
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6d0c464897d1b4d43aaa73a9150981fc3f0a6b74;p=ceph.git

Merge branch 'hammer' of jenkins.front.sepia.ceph.com:ceph/ceph into hammer
---

6d0c464897d1b4d43aaa73a9150981fc3f0a6b74