Merge remote-tracking branch 'upstream/master' into zope4py2

software/ors-amarisoft/buildout.hash.cfg

@@ -60,7 +60,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 68ac87c7e3d2d3fb0e0601f83f949915
+md5sum = 1d0bbfa1cd22740db4f1034588c946eb
 
 [sib23.asn]
 filename = config/sib23.asn
@@ -68,7 +68,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = 374a1943e400a908e1aee8e123683f6f
+md5sum = 2e051b91c39542152bc679ec78cb5926
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh

software/ors-amarisoft/config/enb.jinja2.cfg

@@ -90,7 +90,6 @@
     cell_barred: false,
     intra_freq_reselection: true,
     q_rx_lev_min: -70,
-    p_max: 10,
     si_window_length: 40,
     sib_sched_list: [
       {

software/ors-amarisoft/config/gnb.jinja2.cfg

@@ -232,7 +232,6 @@
     intra_freq_reselection: true,
     q_rx_lev_min: -70,
     q_qual_min: -20,
-    p_max: 10,
 
     root_sequence_index: 1,