Commits · 9b143e9a6941dfde7831cffcb8046c7e7df83dc0 · Michael Black / OpenXG-RAN

15 Feb, 2019 6 commits
- CI: astyle to help merge · 9b143e9a
  Raphael Defosseux authored Feb 15, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  9b143e9a
- Compilation fix · ee3b6509
  Raphael Defosseux authored Feb 15, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  ee3b6509
- Merge remote-tracking branch 'origin/master' into develop_integration_2019_w07_v2 · 869e0271
  Raphael Defosseux authored Feb 15, 2019
  
  869e0271
- Merge remote-tracking branch 'origin/rhel76-support' into develop_integration_2019_w07_v2 · 21aec744
  Raphael Defosseux authored Feb 15, 2019
  
  21aec744
- Merge remote-tracking branch 'origin/issue397_telnet_stats' into develop_integration_2019_w07_v2 · e4560d8a
  Raphael Defosseux authored Feb 15, 2019
  
  e4560d8a
- Merge remote-tracking branch 'origin/x2' into develop_integration_2019_w07_v2 · 4cdae9d9
  Raphael Defosseux authored Feb 15, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  4cdae9d9
14 Feb, 2019 3 commits
- Merge branch 'issue-399-master-ue-hot-fix' into 'master' · 03d404a6
  Raphael Defosseux authored Feb 14, 2019
```
Hot fix on UE configuration module

See merge request oai/openairinterface5g!506
```
  03d404a6
- Merge branch 'ulsch_scheduler_opti' into 383-ulsch-scheduler-optimization · 0cc04855
  Louis Adrien Dufrene authored Feb 14, 2019
  
  0cc04855
- Adding comment in release notes · 28a1fcde
  Raphael Defosseux authored Feb 14, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  28a1fcde
13 Feb, 2019 8 commits
- CI: trying to improve reliability of L2 sim · e85bd103
  Raphael Defosseux authored Feb 12, 2019
```
 -- checking if oip1 interface has an IP address before pinging
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
(cherry picked from commit a4dd3fdb)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  e85bd103
- Proposal of Francois Taburet · 7c63d0d5
  Boris Djalal authored Feb 13, 2019
```
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
```
  7c63d0d5
- x2: fix compilation · e4443b18
  Cedric Roux authored Feb 13, 2019
  
  e4443b18
- Merge remote-tracking branch 'origin/develop' into x2 · 1c6b9f0e
  Cedric Roux authored Feb 13, 2019
```
 Conflicts:
	openair2/LAYER2/MAC/config.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/rrc_defs.h
```
  1c6b9f0e
- Hot fix on UE configuration module proposed by Xenofon Foukas · fcb16521
  Raphael Defosseux authored Feb 13, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  fcb16521
- RHE7.6: UHD installation should be now correct · 4766a694
  Raphael Defosseux authored Feb 13, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  4766a694
- Fix for all other OS versions · d035be0d
  Raphael Defosseux authored Feb 13, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  d035be0d
- Merge from develop · ce87a9dc
  Louis Adrien Dufrene authored Feb 13, 2019
  
  ce87a9dc
12 Feb, 2019 1 commit
- minor change for UHD on RHEL7.6 · b7cbb431
  Raymond Knopp authored Feb 12, 2019
  
  b7cbb431
11 Feb, 2019 2 commits
- Merge remote-tracking branch 'origin/develop_integration_2019_w06' into develop · 52754797
  Cedric Roux authored Feb 11, 2019
```
merge:
- enhancement-ltem
```
  52754797
- Merge remote-tracking branch 'origin/enhancement-ltem' into develop_integration_2019_w06 · 26e9fe81
  Cedric Roux authored Feb 11, 2019
  
  26e9fe81
10 Feb, 2019 1 commit
- minor changes in CMakelists.txt for building on RHEL7.6. Note, the optional packages in · b22f2d88
  Raymond Knopp authored Feb 10, 2019
```
/etc/yum.repos.d/redhat.repo by setting "enabled = 1" in [rhel-6-server-optional-rpms] section
```
  b22f2d88
08 Feb, 2019 1 commit
- minor change for CI with L2 emulator (NFAPI) · dd63e523
  Raymond Knopp authored Feb 08, 2019
  
  dd63e523
07 Feb, 2019 3 commits
- Merge remote-tracking branch 'origin/develop' into enhancement-ltem · e704e7cc
  Raymond Knopp authored Feb 07, 2019
  
  e704e7cc
- Add cpu measurements access from telnet server · 5a519297
  frtabu authored Feb 07, 2019
  
  5a519297
- improve flexibility of measure implementation · bbf4cc31
  frtabu authored Feb 07, 2019
  
  bbf4cc31
06 Feb, 2019 1 commit
- rewrite lte stats display, prepare cpu stats display · eb6e5ffe
  frtabu authored Feb 06, 2019
  
  eb6e5ffe
01 Feb, 2019 2 commits
- fix after merge · 932f6017
  Cedric Roux authored Feb 01, 2019
  
  932f6017
- Merge remote-tracking branch 'origin/develop' into x2 · be68e1e6
  Cedric Roux authored Feb 01, 2019
```
Conflicts:
	common/utils/msc/msc.h
	openair2/X2AP/x2ap_eNB.c
```
  be68e1e6
31 Jan, 2019 2 commits

Merge remote-tracking branch 'origin/develop' · f7a2965b
Raphael Defosseux authored Jan 31, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
f7a2965b

Merge branch 'develop_integration_2019_w04' into 'develop' · 05f395b2

Raphael Defosseux authored Jan 31, 2019

See merge request oai/openairinterface5g!494

Integration Branch: 2019 week 04 -- master candidate

* MR 488: Issue 390 configmodule cmdlinebug
* MR 490: Issue391 remove L1L2 task
* MR 495: CentOS build fix

05f395b2

29 Jan, 2019 1 commit
- Fixing L2-simulator for TDD environment · f7938a4b
  Raphael Defosseux authored Jan 29, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  f7938a4b
28 Jan, 2019 1 commit
- CI: removing the yml GitLab CI file (useless w/ our Jenkins pipelines) · c81820b2
  Raphael Defosseux authored Jan 28, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  c81820b2
25 Jan, 2019 6 commits
- Documentation update for master release · f591427e
  Raphael Defosseux authored Jan 25, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  f591427e
- Merge branch 'develop_integration_2019_w04' of... · 1b2ea388
  Raphael Defosseux authored Jan 25, 2019
```
Merge branch 'develop_integration_2019_w04' of gitlab.eurecom.fr:oai/openairinterface5g into develop_integration_2019_w04
```
  1b2ea388
- update openair1/README.txt · c1ed6685
  Florian Kaltenberger authored Jan 25, 2019
  
  c1ed6685
- Merge remote-tracking branch 'origin/hotfix_centos_build' into develop_integration_2019_w04 · 1b14813a
  Raphael Defosseux authored Jan 25, 2019
  
  1b14813a
- documentation: describe UE's NAS · 8c388b7c
  Cedric Roux authored Jan 25, 2019
  
  8c388b7c
- CI: hotfix on the CentOS build on OSA bench · f031fda9
  Raphael Defosseux authored Jan 25, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  f031fda9
24 Jan, 2019 2 commits
- Fixing a few warnings (flexran) · 2d7c9734
  Raphael Defosseux authored Jan 24, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  2d7c9734
- Manual merge conflict resolution was incorrect. · bb4a1f9a
  Raphael Defosseux authored Jan 24, 2019
```
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
```
  bb4a1f9a