]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1eca89d e2b151d)
Merge pull request #2054 from ceph/wip-fs-cmds-oops
authorGregory Farnum <greg@inktank.com>
Tue, 1 Jul 2014 18:49:21 +0000 (11:49 -0700)
committerGregory Farnum <greg@inktank.com>
Tue, 1 Jul 2014 18:49:21 +0000 (11:49 -0700)
Apply some accidentally-dropped commits from the wip-fs-cmds branch to be a little friendlier and pass tests.

Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.