Merge remote-tracking branch 'gh/wip-log'

diff --cc src/Makefile.am
Simple merge

diff --cc src/ceph_mon.cc
Simple merge

diff --cc src/crush/CrushWrapper.cc
Simple merge

diff --cc src/msg/SimpleMessenger.cc
Simple merge

diff --cc src/msg/SimpleMessenger.h
Simple merge

diff --cc src/os/FileStore.cc
Simple merge

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

diff --cc src/osd/OSDMap.cc
index b98dcfa68fd06b1e897e9a7f9e6084386c1cc7f2,67cd4cb7c0185c8106d8b73c8722a829ca1a1a7d..8167046b0b71eb521c62a4acfbae3f3b552c23ea
--- 1/src/osd/OSDMap.cc
--- 2/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@@ -1284,15 -1277,9 +1286,15 @@@ void OSDMap::build_simple_crush_map_fro
      map<string,string> loc;
      loc["host"] = host;
      loc["rack"] = rack;
 +    if (row.size())
 +      loc["row"] = row;
 +    if (room.size())
 +      loc["room"] = room;
 +    if (dc.size())
 +      loc["datacenter"] = dc;
      loc["pool"] = "default";
  
-     ldout(cct, 0) << " adding osd." << o << " at " << loc << dendl;
+     ldout(cct, 5) << " adding osd." << o << " at " << loc << dendl;
      crush.insert_item(cct, o, 1.0, *i, loc);
    }
  

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

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/rgw/rgw_main.cc
Simple merge