]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix merge artifact
authorYehuda Sadeh <yehuda@redhat.com>
Fri, 30 Jan 2015 00:07:41 +0000 (16:07 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 30 Jan 2015 00:07:41 +0000 (16:07 -0800)
s/XMLArgs/RGWHTTPArgs

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
src/rgw/rgw_common.cc

index 530778f3bac47b6ba14b4879eec8485c6536cbc8..f3988cffd34868212586575bca55ed4dd95da984 100644 (file)
@@ -662,7 +662,7 @@ int RGWHTTPArgs::get_bool(const char *name, bool *val, bool *exists)
   return get_bool(s, val, exists);
 }
 
-void XMLArgs::get_bool(const char *name, bool *val, bool def_val)
+void RGWHTTPArgs::get_bool(const char *name, bool *val, bool def_val)
 {
   bool exists = false;
   if ((get_bool(name, val, &exists) < 0) ||