]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6042 from dreamhost/wip-hammer-crossftp
authorYehuda Sadeh <yehuda@redhat.com>
Mon, 12 Oct 2015 15:14:47 +0000 (08:14 -0700)
committerYehuda Sadeh <yehuda@redhat.com>
Mon, 12 Oct 2015 15:14:47 +0000 (08:14 -0700)
rgw: remove trailing :port from host for purposes of subdomain matching

1  2 
src/rgw/rgw_common.cc
src/rgw/rgw_rest.cc

Simple merge
Simple merge