]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b606ab1 c935885)
Merge branch 'ldap-auth-custom-searchfilter' of https://github.com/haklein/ceph into...
authorMatt Benjamin <mbenjamin@redhat.com>
Mon, 19 Sep 2016 21:26:29 +0000 (17:26 -0400)
committerMatt Benjamin <mbenjamin@redhat.com>
Mon, 19 Sep 2016 21:26:29 +0000 (17:26 -0400)
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.