]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: use string for default realm
authorOrit Wasserman <owasserm@redhat.com>
Fri, 3 Jul 2015 15:03:06 +0000 (17:03 +0200)
committerYehuda Sadeh <yehuda@redhat.com>
Tue, 9 Feb 2016 20:59:42 +0000 (12:59 -0800)
Conflicts:
src/rgw/rgw_rados.cc

src/rgw/rgw_rados.cc

index 22b842e3e9941c0d1fcd3a3d8514825dbb0cc6e4..b562ee2c946ec2391657c5066d53743ee445b836 100644 (file)
@@ -84,7 +84,7 @@ static RGWObjCategory main_category = RGW_OBJ_CATEGORY_MAIN;
 
 #define RGW_DEFAULT_ZONE_ROOT_POOL "rgw.root"
 #define RGW_DEFAULT_REGION_ROOT_POOL "rgw.root"
-#define RGW_DEFAULT_REALM_ROOT_POOL "rgw.root"
+static string RGW_DEFAULT_REALM_ROOT_POOL = "rgw.root";
 
 #define RGW_STATELOG_OBJ_PREFIX "statelog."