From: Sage Weil <sage@inktank.com>
Date: Thu, 29 Nov 2012 23:48:54 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.56~136
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c26dc1885d62fad4c28882b023ef62c4d195b132;p=ceph.git

Merge branch 'next'

Conflicts:
	src/rgw/rgw_admin.cc
---

c26dc1885d62fad4c28882b023ef62c4d195b132
diff --cc src/rgw/rgw_admin.cc
index 6a7d7915a69,0e2b8b32391..fb419d93b4c
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@@ -650,13 -648,15 +650,22 @@@ static int remove_bucket(RGWRados *stor
    return ret;
  }
  
 +static bool bucket_object_check_filter(const string& name)
 +{
 +  string ns;
 +  string obj = name;
 +  return rgw_obj::translate_raw_obj_to_obj_in_ns(obj, ns);
 +}
 +
+ class StoreDestructor {
+   RGWRados *store;
+ public:
+   StoreDestructor(RGWRados *_s) : store(_s) {}
+   ~StoreDestructor() {
+     RGWStoreManager::close_storage(store);
+   }
+ };
+ 
  int main(int argc, char **argv) 
  {
    vector<const char*> args;