Merge remote branch 'gh/wip-backfill'

Reviewed-by: Samuel Just <samuel.just@dreamhost.com>
Conflicts:
	src/ceph_mds.cc
	src/ceph_osd.cc

diff --cc src/Makefile.am
Simple merge

diff --cc src/ceph_mds.cc
index ee54457b119bd77bf99f95c71cd07cc48ab83840,302ddeb5d3e4bcdb7502b3fcc7c93856749a8967..31b464a91812acff122e53c33a7b542bcbe262af
--- 1/src/ceph_mds.cc
--- 2/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@@ -213,9 -211,9 +213,12 @@@ int main(int argc, const char **argv
    global_print_banner();
  
    SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context);
 -  messenger->bind(g_conf->public_addr, getpid());
+   messenger->set_cluster_protocol(CEPH_MDS_PROTOCOL);
+ 
 +  int r = messenger->bind(g_conf->public_addr, getpid());
 +  if (r < 0)
 +    exit(1);
++
    cout << "starting " << g_conf->name << " at " << messenger->get_ms_addr()
         << std::endl;
    messenger->register_entity(entity_name_t::MDS(-1));

diff --cc src/ceph_osd.cc
index 526b34af7481a4ee7f4000f2350d24c9ce4e66a6,a775562fd617cec780d9f85ea22e802c9ceb18ca..a272ac2b0412e6ba4702856522f3a221290bcf57
--- 1/src/ceph_osd.cc
--- 2/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@@ -274,13 -274,13 +274,16 @@@ int main(int argc, const char **argv
    SimpleMessenger *cluster_messenger = new SimpleMessenger(g_ceph_context);
    SimpleMessenger *messenger_hbin = new SimpleMessenger(g_ceph_context);
    SimpleMessenger *messenger_hbout = new SimpleMessenger(g_ceph_context);
 -
+   cluster_messenger->set_cluster_protocol(CEPH_OSD_PROTOCOL);
+   messenger_hbin->set_cluster_protocol(CEPH_OSD_PROTOCOL);
+   messenger_hbout->set_cluster_protocol(CEPH_OSD_PROTOCOL);
  
 -  client_messenger->bind(g_conf->public_addr, getpid());
 -  cluster_messenger->bind(g_conf->cluster_addr, getpid());
 +  r = client_messenger->bind(g_conf->public_addr, getpid());
 +  if (r < 0)
 +    exit(1);
 +  r = cluster_messenger->bind(g_conf->cluster_addr, getpid());
 +  if (r < 0)
 +    exit(1);
  
    // hb should bind to same ip as cluster_addr (if specified)
    entity_addr_t hb_addr = g_conf->cluster_addr;

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