]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7dc5fb 41aa50b)
Merge branch 'wip-13127-master' into greg-fs-testing
authorGreg Farnum <gfarnum@redhat.com>
Wed, 13 Jan 2016 02:37:24 +0000 (18:37 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Thu, 14 Jan 2016 18:25:35 +0000 (10:25 -0800)
https://github.com/ceph/ceph/pull/5990

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

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