From: Gregory Farnum Date: Tue, 1 Jul 2014 18:49:21 +0000 (-0700) Subject: Merge pull request #2054 from ceph/wip-fs-cmds-oops X-Git-Tag: v0.84~161 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3a6711f867de7f0fdbbd61eabb09a32686a2dba4;p=ceph.git Merge pull request #2054 from ceph/wip-fs-cmds-oops Apply some accidentally-dropped commits from the wip-fs-cmds branch to be a little friendlier and pass tests. Reviewed-by: Greg Farnum --- 3a6711f867de7f0fdbbd61eabb09a32686a2dba4