]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'jewel-13903' of git://github.com/ukernel/ceph into greg-fs-testing
authorGreg Farnum <gfarnum@redhat.com>
Tue, 26 Jan 2016 19:00:24 +0000 (11:00 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Tue, 26 Jan 2016 19:00:24 +0000 (11:00 -0800)
commit95ce3ce23a4460cfa1288af9705e5173b0a49b54
tree93fc98bca8f509e2c1fd2abd59f6f9b58fe0153c
parent0d238b90dc922568c4c7d949638b4adc455925d9
parentd74a7c10fe08ae884a1f552e321b8cb26969bce4
Merge branch 'jewel-13903' of git://github.com/ukernel/ceph into greg-fs-testing

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

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
src/client/Client.cc