From: Samuel Just <sam.just@inktank.com>
Date: Tue, 23 Sep 2014 17:27:15 +0000 (-0700)
Subject: Merge branch 'wip-sam-testing-firefly' into firefly
X-Git-Tag: v0.80.6~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2abd7a3fd018b52f45f9d6b7c9d847242aa97fe9;p=ceph.git

Merge branch 'wip-sam-testing-firefly' into firefly
---

2abd7a3fd018b52f45f9d6b7c9d847242aa97fe9