]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #23849 from tchaikov/wip-crimson-monc
authorNeha Ojha <nehaojha88@gmail.com>
Tue, 16 Oct 2018 15:10:36 +0000 (08:10 -0700)
committerGitHub <noreply@github.com>
Tue, 16 Oct 2018 15:10:36 +0000 (08:10 -0700)
crimson: add MonClient

Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/CMakeLists.txt
src/crimson/CMakeLists.txt
src/crimson/net/SocketConnection.cc

Simple merge
index a17648986ebde981b3b782544935a810bcc817c4,7f331e11e4c457e073fc821927e3803c7a19efd7..519c1629840c391307483aa9ceec3586a5702f8b
@@@ -106,8 -106,14 +106,14 @@@ target_link_libraries(crimson-commo
      crimson::cflags
      Boost::iostreams
      Boost::random
 -    ${NSS_LIBRARIES} ${NSPR_LIBRARIES} ${OPENSSL_LIBRARIES})
 +    ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
  
+ set(crimson_auth_srcs
+   auth/KeyRing.cc)
+ set(crimson_mon_srcs
+   mon/MonClient.cc
+   ${PROJECT_SOURCE_DIR}/src/mon/MonMap.cc
+   ${PROJECT_SOURCE_DIR}/src/mon/MonSub.cc)
  set(crimson_net_srcs
    net/Dispatcher.cc
    net/Errors.cc
Simple merge