git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bf814d5 36d6eea)

author	Sage Weil <sage@redhat.com>
	Fri, 20 Mar 2015 00:19:59 +0000 (17:19 -0700)
committer	Sage Weil <sage@redhat.com>
	Fri, 20 Mar 2015 00:19:59 +0000 (17:19 -0700)
commit	c56773021cc40f2a7f5572ed501fc02b59793d7f
tree	1fa0d53a4579d488bd669ee2446997b23c4b9fba	tree \| snapshot
parent	bf814d5248c8bf394e4e7b3ef27c0fc7ff1b7bc5	commit \| diff
parent	36d6eea3caa79fcb4e08bdd340ccda2474b9e5ea	commit \| diff

Merge pull request #4085 from ceph/wip-11160

rgw: don't use rgw_socket_path if frontend is configured

Reviewed-by: Sage Weil <sage@redhat.com>

Unnamed repository; edit this file 'description' to name the repository.