]> 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: eaa9338 1539d90)
Merge pull request #8168 from linuxbox2/rgw-ldap-fixes
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 16 Mar 2016 20:41:06 +0000 (13:41 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Wed, 16 Mar 2016 20:41:06 +0000 (13:41 -0700)
Rgw ldap fixes

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1  2 
src/common/config_opts.h patch | diff1 | diff2 | blob | history
src/rgw/rgw_rest_s3.cc patch | diff1 | diff2 | blob | history

diff --cc src/common/config_opts.h
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.