Merge pull request #818 from ceph/wip-rgw-standalone-2

Wip rgw standalone 2

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

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/rgw/Makefile.am
index d3464eaba518a1c2eb46a6cf07a7bca7858b75e4,2cfa20caace2e2150da38ffa79e4157ee991bc57..a2c06abe260ec50ffa8acf49dfbb6d39965611ae
--- 1/src/rgw/Makefile.am
--- 2/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
@@@ -67,8 -67,10 +67,10 @@@ radosgw_SOURCES = 
        rgw/rgw_http_client.cc \
        rgw/rgw_swift.cc \
        rgw/rgw_swift_auth.cc \
+       rgw/rgw_mongoose.cc \
+       mongoose/mongoose.c \
        rgw/rgw_main.cc
 -radosgw_LDADD = $(LIBRGW) $(LIBRGW_DEPS) -lresolv $(CEPH_GLOBAL)
 +radosgw_LDADD = $(LIBRGW) $(LIBRGW_DEPS) $(RESOLV_LIBS) $(CEPH_GLOBAL)
  bin_PROGRAMS += radosgw
  
  radosgw_admin_SOURCES = rgw/rgw_admin.cc

diff --cc src/rgw/rgw_common.cc
Simple merge

diff --cc src/rgw/rgw_common.h
Simple merge

diff --cc src/rgw/rgw_env.cc
Simple merge

diff --cc src/rgw/rgw_main.cc
Simple merge

diff --cc src/rgw/rgw_op.cc
Simple merge