• unknown's avatar
    Merge · fd152f68
    unknown authored
    
    ndb/include/util/SocketServer.hpp:
      Auto merged
    ndb/src/common/mgmcommon/ConfigRetriever.cpp:
      Auto merged
    ndb/src/common/util/SocketClient.cpp:
      Auto merged
    ndb/src/common/util/SocketServer.cpp:
      Auto merged
    ndb/src/common/util/version.c:
      Auto merged
    ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
      Auto merged
    ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
      Auto merged
    ndb/src/mgmclient/main.cpp:
      Auto merged
    ndb/src/mgmsrv/MgmtSrvr.hpp:
      Auto merged
    ndb/src/ndbapi/ClusterMgr.cpp:
      Auto merged
    ndb/tools/restore/restore_main.cpp:
      Auto merged
    ndb/include/util/ndb_opts.h:
      merge
    ndb/src/common/mgmcommon/IPCConfig.cpp:
      merge
    ndb/src/common/transporter/TransporterRegistry.cpp:
      merge
    ndb/src/mgmapi/mgmapi.cpp:
      merge
    ndb/src/mgmclient/CommandInterpreter.cpp:
      merge
    ndb/src/mgmsrv/MgmtSrvr.cpp:
      merge
    ndb/src/mgmsrv/Services.cpp:
      merge
    ndb/src/mgmsrv/main.cpp:
      merge
    ndb/src/ndbapi/TransporterFacade.cpp:
      merge
    fd152f68
main.cpp 4.35 KB