Merge branch 'next'

Conflicts:
	src/rgw/rgw_admin.cc

diff --cc src/ceph_mon.cc
Simple merge

diff --cc src/client/Client.cc
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/rgw/rgw_admin.cc
index 6a7d7915a692e259bb01099093218bf54c905e44,0e2b8b32391830a0d139076d2f18c8b6d87c4c36..fb419d93b4cfd459408b653fa4034f5970dfc229
--- 1/src/rgw/rgw_admin.cc
--- 2/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;