From: Josh Durgin <josh.durgin@inktank.com>
Date: Tue, 6 May 2014 17:12:45 +0000 (-0700)
Subject: Merge pull request #1748 from onlyjob/docs
X-Git-Tag: v0.81~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b48e52c4cd89b07c8def0296af24e9f744721d0;p=ceph.git

Merge pull request #1748 from onlyjob/docs

sample.ceph.conf update:

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

2b48e52c4cd89b07c8def0296af24e9f744721d0