From: Sage Weil <sage@redhat.com>
Date: Thu, 29 Jan 2015 21:28:26 +0000 (-0800)
Subject: Merge branch 'prio_hb_pkts' of git://github.com/wenjianhn/ceph
X-Git-Tag: v0.93~158
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2980f3ac52fa8568f666598a4d39e6f571f6b60a;p=ceph.git

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

Conflicts:
	src/msg/Messenger.h
---

2980f3ac52fa8568f666598a4d39e6f571f6b60a
diff --cc src/msg/Messenger.h
index fac53ceb54be,1bdcd10986d0..429e5007e778
--- a/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;
    }