Merge branch 'wip-heartbeats'

Conflicts:
	src/osd/OSD.cc

diff --cc src/osd/OSD.cc
index ca937d79421f3dc9d138c56be70ac6fcda8b2398,2c867dff2d6b46c4e1c48780106ce2472b74f75b..63942c1a2638b7f4522159621637ba5edcf8625e
--- 1/src/osd/OSD.cc
--- 2/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -3114,10 -3082,10 +3084,10 @@@ void OSD::handle_osd_map(MOSDMap *m
        clog.warn() << "map e" << osdmap->get_epoch()
                    << " had wrong client addr (" << osdmap->get_cluster_addr(whoami)
                    << " != my " << cluster_messenger->get_myaddr();
-       else if (!osdmap->get_hb_addr(whoami).probably_equals(heartbeat_messenger->get_myaddr()))
 -      else if (osdmap->get_hb_addr(whoami).probably_equals(hbout_messenger->get_myaddr()))
++      else if (!osdmap->get_hb_addr(whoami).probably_equals(hbout_messenger->get_myaddr()))
        clog.warn() << "map e" << osdmap->get_epoch()
                    << " had wrong client addr (" << osdmap->get_hb_addr(whoami)
-                   << " != my " << heartbeat_messenger->get_myaddr();
+                   << " != my " << hbout_messenger->get_myaddr();
        
        state = STATE_BOOTING;
        up_epoch = 0;