]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #3125 from ceph/wip-10194-master
authorSage Weil <sage@redhat.com>
Thu, 29 Jan 2015 23:06:11 +0000 (15:06 -0800)
committerSage Weil <sage@redhat.com>
Thu, 29 Jan 2015 23:06:11 +0000 (15:06 -0800)
commit243860b5e413c23ea642d368a8f771e6c484d1eb
treed203185c60f08dd919aec7a35dda372b9874a6f7
parent2980f3ac52fa8568f666598a4d39e6f571f6b60a
parent4feb8644d36752658f13dcbae80da5f2a3db95f6
Merge pull request #3125 from ceph/wip-10194-master

Wip 10194 master

Reviewed-by: Sage Weil <sage@redhat.com>
src/common/Makefile.am
src/rgw/rgw_main.cc