From: Sage Weil <sage@inktank.com>
Date: Fri, 20 Dec 2013 21:41:58 +0000 (-0800)
Subject: Merge pull request #818 from ceph/wip-rgw-standalone-2
X-Git-Tag: v0.75~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7bacc413f3f6d8cfce3ea7f7510200bd03854767;p=ceph.git

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

Wip rgw standalone 2

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

7bacc413f3f6d8cfce3ea7f7510200bd03854767
diff --cc src/rgw/Makefile.am
index d3464eaba518,2cfa20caace2..a2c06abe260e
--- a/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