Raymond Knopp a446eb0ebc Merge branch 'episys/master' into episys-merge ...

Conflicts:
	common/utils/LOG/log.h
	common/utils/ocp_itti/intertask_interface.cpp
	nfapi/oai_integration/nfapi_vnf.c
	nfapi/open-nFAPI/nfapi/src/nfapi.c
	openair2/LAYER2/MAC/main_ue.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/PHY_INTERFACE/phy_stub_UE.c
	openair2/RRC/LTE/rrc_UE.c
	openair2/RRC/LTE/rrc_eNB.c
	openair3/NAS/UE/ESM/esm_ebr_context.c
	targets/COMMON/openairinterface5g_limits.h
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c

2021-02-13 22:52:33 +01:00

..

API

Select fair RR packet scheduler

2020-12-23 09:28:54 -08:00

EMM

Set correct UE ID in Kenb Refresh Req

2020-03-04 13:38:04 +01:00

ESM

Merge branch 'episys/master' into episys-merge

2021-02-13 22:52:33 +01:00

nas_itti_messaging.c

itti dynamic queue creation, and 64 bits instance id

2020-12-23 13:56:01 +01:00

nas_itti_messaging.h

Set correct UE ID in Kenb Refresh Req

2020-03-04 13:38:04 +01:00

nas_network.c

Patch provided by Gabriel Arrobo.

2020-01-09 14:10:04 +01:00

nas_network.h

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

nas_parser.c

Patch provided by Gabriel Arrobo.

2020-01-09 14:10:04 +01:00

nas_parser.h

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

nas_proc_defs.h

UE: move _nas_user_context to nas_user_t

2017-01-25 13:12:20 +01:00

nas_proc.c

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

nas_proc.h

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

nas_ue_task.c

Merge branch 'episys/master' into episys-merge

2021-02-13 22:52:33 +01:00

nas_ue_task.h

ENABLE_ITTI macro removal, modified telnet server to support all executables, modified record player to finalize switch to run-time option and allow usage with any device

2020-02-12 19:05:44 +01:00

nas_user.c

Remove Coverity Scan CID 60471 (Function memory_read does not terminate string *user->nas_user_nvdata.)

2019-06-21 18:34:14 +09:00

nas_user.h

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

UEprocess.c

Patch provided by Gabriel Arrobo.

2020-01-09 14:10:04 +01:00

user_defs.h

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00