From: Dan Mick <dan.mick@inktank.com>
Date: Fri, 7 Jun 2013 17:57:51 +0000 (-0700)
Subject: Merge branch 'wip-ceph-cli'
X-Git-Tag: v0.65~136
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f4f6758bdb8f9f3afb1c62f0a4f22bb956fe1e15;p=ceph.git

Merge branch 'wip-ceph-cli'

Reviewed-by: Sage Weil <sage@inktank.com>
---

f4f6758bdb8f9f3afb1c62f0a4f22bb956fe1e15