]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge remote-tracking branch 'private/wip-cx'
authorSage Weil <sage@redhat.com>
Mon, 9 Jul 2018 13:07:29 +0000 (08:07 -0500)
committerSage Weil <sage@redhat.com>
Mon, 9 Jul 2018 13:07:29 +0000 (08:07 -0500)
commit6564adc87811a4d9807615163478f148591ebd37
treee83d810376be36ff82da1fbaebefb6f5b7dccebc
parentebbc3bc241330ef9591abf2759547d64aa56875e
parent721d7e622bb4b301f0a69a6e236d25c49bd621ad
Merge remote-tracking branch 'private/wip-cx'

 Conflicts:
src/include/ceph_features.h
src/msg/async/AsyncConnection.cc
src/msg/async/AsyncConnection.h

- SERVER_NAUTLIUS feature recently added to default
- msgr2 bool
- ceph::shared_ptr -> std::shared_ptr
22 files changed:
src/common/legacy_config_opts.h
src/common/options.cc
src/include/ceph_features.h
src/include/msgr.h
src/mds/MDSDaemon.cc
src/mds/MDSDaemon.h
src/mgr/DaemonServer.cc
src/mgr/DaemonServer.h
src/mon/AuthMonitor.cc
src/mon/Monitor.cc
src/mon/Monitor.h
src/msg/Messenger.h
src/msg/async/AsyncConnection.cc
src/msg/async/AsyncConnection.h
src/msg/async/AsyncMessenger.h
src/msg/simple/Pipe.cc
src/msg/simple/SimpleMessenger.cc
src/msg/simple/SimpleMessenger.h
src/osd/OSD.cc
src/osd/OSD.h
src/osd/OSDMap.cc
src/test/msgr/test_msgr.cc