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)
Wip 10194 master

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

Simple merge
Simple merge