Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
Conflicts: openair2/LAYER2/MAC/config.c
No related branches found
No related tags found
Showing
- cmake_targets/CMakeLists.txt 80 additions, 9 deletionscmake_targets/CMakeLists.txt
- cmake_targets/build_oai 9 additions, 1 deletioncmake_targets/build_oai
- cmake_targets/tools/build_helper 17 additions, 8 deletionscmake_targets/tools/build_helper
- common/config/config_cmdline.c 6 additions, 3 deletionscommon/config/config_cmdline.c
- common/config/config_load_configmodule.c 5 additions, 4 deletionscommon/config/config_load_configmodule.c
- common/config/config_load_configmodule.h 1 addition, 0 deletionscommon/config/config_load_configmodule.h
- common/config/config_userapi.c 10 additions, 1 deletioncommon/config/config_userapi.c
- common/config/config_userapi.h 4 additions, 0 deletionscommon/config/config_userapi.h
- common/config/libconfig/config_libconfig.c 20 additions, 9 deletionscommon/config/libconfig/config_libconfig.c
- common/utils/T/T_defs.h 1 addition, 1 deletioncommon/utils/T/T_defs.h
- common/utils/T/T_messages.txt 36 additions, 0 deletionscommon/utils/T/T_messages.txt
- nfapi/README 15 additions, 0 deletionsnfapi/README
- nfapi/oai_integration/nfapi.c 51 additions, 0 deletionsnfapi/oai_integration/nfapi.c
- nfapi/oai_integration/nfapi_pnf.c 1625 additions, 0 deletionsnfapi/oai_integration/nfapi_pnf.c
- nfapi/oai_integration/nfapi_pnf.h 27 additions, 0 deletionsnfapi/oai_integration/nfapi_pnf.h
- nfapi/oai_integration/nfapi_vnf.c 1221 additions, 0 deletionsnfapi/oai_integration/nfapi_vnf.c
- nfapi/oai_integration/nfapi_vnf.h 27 additions, 0 deletionsnfapi/oai_integration/nfapi_vnf.h
- nfapi/oai_integration/vendor_ext.h 67 additions, 0 deletionsnfapi/oai_integration/vendor_ext.h
- nfapi/open-nFAPI/.travis.yml 36 additions, 0 deletionsnfapi/open-nFAPI/.travis.yml
- nfapi/open-nFAPI/CHANGELOG.md 0 additions, 0 deletionsnfapi/open-nFAPI/CHANGELOG.md
Loading
Please register or sign in to comment