]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1d3f80a 58a1a45)
Merge remote-tracking branch 'origin/wip-libcephfs-acl' into greg-fs-testing
authorGreg Farnum <gfarnum@redhat.com>
Thu, 14 Jan 2016 18:24:15 +0000 (10:24 -0800)
committerGreg Farnum <gfarnum@redhat.com>
Thu, 14 Jan 2016 18:24:15 +0000 (10:24 -0800)
commite7dc5fb7988785afb934de30cd1004bd3ce7a26d
treecf6ce787af425484d652ba95f9c79d5fc707be6dtree | snapshot
parent1d3f80acc3221b77a88894f0c3801772aff3f7a7commit | diff
parent58a1a45a7dac0be7ac5420a66e9fa4d5b2565131commit | diff
Merge remote-tracking branch 'origin/wip-libcephfs-acl' into greg-fs-testing

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

Reviewed-by: John Spray <jspray@redhat.com>
Conflicts:
src/common/config_opts.h

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
src/client/Client.cc diff1 | diff2 | blob | history
src/client/Client.h diff1 | diff2 | blob | history
src/common/config_opts.h diff1 | diff2 | blob | history
src/include/ceph_fs.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.