From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 30 Jan 2015 00:07:41 +0000 (-0800)
Subject: rgw: fix merge artifact
X-Git-Tag: v0.93~156^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=01cc9d54d0ff3977ed7bb570ee12fa4a7909f59c;p=ceph.git

rgw: fix merge artifact

s/XMLArgs/RGWHTTPArgs

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 530778f3bac4..f3988cffd348 100644
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -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) ||