]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commitbf9790e1c5433e6c0ffd26a113b2db32f242205e
tree388bc40f624045552690ac7dcadb62cb6811c3a8
parente7dc5fb7988785afb934de30cd1004bd3ce7a26d
parent41aa50b45e2c61e4b75315112849b00691d6ea12
Merge branch 'wip-13127-master' into greg-fs-testing

https://github.com/ceph/ceph/pull/5990

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