From: Gary Lowell <gary.lowell@inktank.com>
Date: Fri, 4 Oct 2013 19:51:32 +0000 (+0000)
Subject: Merge branch 'dumpling' of jenkins:ceph/ceph into dumpling
X-Git-Tag: v0.67.5~34
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42fc9b49a7bbc242096946b381aafd435ebdd530;p=ceph.git

Merge branch 'dumpling' of jenkins:ceph/ceph into dumpling
---

42fc9b49a7bbc242096946b381aafd435ebdd530