Merge remote-tracking branch 'gh/hammer'

Conflicts:
	src/gmock

diff --cc src/common/config_opts.h
Simple merge

diff --cc src/osd/PG.cc
Simple merge

diff --cc src/osd/PG.h
Simple merge

diff --cc src/osd/ReplicatedPG.cc
Simple merge

diff --cc src/osd/ReplicatedPG.h
Simple merge

diff --cc src/rgw/rgw_main.cc
index 84c0eda8f14035f50a43111bb70e4135cfa6566f,d15695885bb15ab5a547b1e4286feb802739d54c..5b412777e5cf4d6e665663ee12a796713ec47a24
--- 1/src/rgw/rgw_main.cc
--- 2/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@@ -1071,9 -1064,13 +1071,14 @@@ int main(int argc, const char **argv
    FCGX_Init();
  
    int r = 0;
 -  RGWRados *store = RGWStoreManager::get_storage(g_ceph_context, true, true);
 +  RGWRados *store = RGWStoreManager::get_storage(g_ceph_context,
 +      g_conf->rgw_enable_gc_threads, g_conf->rgw_enable_quota_threads);
    if (!store) {
+     mutex.Lock();
+     init_timer.cancel_all_events();
+     init_timer.shutdown();
+     mutex.Unlock();
+ 
      derr << "Couldn't init storage provider (RADOS)" << dendl;
      return EIO;
    }