Merge commit 'origin/unstable' into auth

Conflicts:

	src/osd/OSD.cc

diff --cc src/kernel/buffer.h
Simple merge

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

diff --cc src/mon/MonClient.h
Simple merge

diff --cc src/osd/OSD.cc
index d0632c4aec0f3d4bae2e4e031e0907d6277a560a,0094e5456580b8ab800f131622f59f5282b876ac..66bc5e8a18aff47dcf827ccd59a709fda419b88b
--- 1/src/osd/OSD.cc
--- 2/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -424,10 -422,9 +424,13 @@@ int OSD::init(
    
    monc->init();
  
 +  EntityName ename;
 +  ename.entity_type = CEPHX_PRINCIPAL_OSD;
 +  ename.name = g_conf.id;
 +
+   monc->sub_want("monmap", 0);
+   monc->renew_subs();  
+ 
    // announce to monitor i exist and have booted.
    do_mon_report();