]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8789 from vuhuong/wip-msgr-flex-prop-list
authorYuri Weinstein <yuri.weinstein@gmail.com>
Wed, 8 Jun 2016 14:30:17 +0000 (07:30 -0700)
committerYuri Weinstein <yuri.weinstein@gmail.com>
Wed, 8 Jun 2016 14:30:17 +0000 (07:30 -0700)
msgr,xio: flexible Messenger::create options

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/ceph_mds.cc
src/msg/xio/XioMessenger.cc

diff --cc src/ceph_mds.cc
Simple merge
Simple merge