-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/50-work ndb/include/mgmapi/mgmapi_config_parameters.h: Auto merged ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged ndb/src/kernel/blocks/backup/BackupInit.cpp: merge
66a9dbe1
into perch.ndb.mysql.com:/home/jonas/src/50-work ndb/include/mgmapi/mgmapi_config_parameters.h: Auto merged ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged ndb/src/kernel/blocks/backup/BackupInit.cpp: merge