Merge branch 'prio_hb_pkts' of git://github.com/wenjianhn/ceph

Conflicts:
	src/msg/Messenger.h

diff --cc src/ceph_osd.cc
Simple merge

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

diff --cc src/msg/Messenger.h
index fac53ceb54be18d7dd871b598f5089d0cf1cc5c0,1bdcd10986d0b35a6b1faac0c3e00182aeaa05a3..429e5007e77832f62cf57a340c34b5de5a11fcf8
--- 1/src/msg/Messenger.h
--- 2/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@@ -47,7 -49,7 +49,8 @@@ protected
    int default_send_priority;
    /// set to true once the Messenger has started, and set to false on shutdown
    bool started;
 +  uint32_t magic;
+   int socket_priority;
  
  public:
    /**
@@@ -128,8 -129,8 +131,10 @@@
    Messenger(CephContext *cct_, entity_name_t w)
      : my_inst(),
        default_send_priority(CEPH_MSG_PRIO_DEFAULT), started(false),
-       magic(0), cct(cct_),
++      magic(0),
+       socket_priority(-1),
 -      cct(cct_)
++      cct(cct_),
 +      crcflags(get_default_crc_flags(cct->_conf))
    {
      my_inst.name = w;
    }

diff --cc src/msg/simple/Pipe.cc
Simple merge