Commit 8d1a293d authored by Kirill Smelkov's avatar Kirill Smelkov

Merge branch 'master' into x/lte-multiru

* master:
  software/ors-amarisoft: Merge gnb.jinja2.cfg into enb.jinja2.cfg
  software/ors-amarisoft: enb.jinja2.cfg: Remove unused cell_count
  software/ors-amarisoft: Push amarisoft-stats.jinja2.py and amarisoft-rf-info.jinja2.py into ru/
  software/ors-amarisoft: Push SSH server code into ru/lopcomm/
  software/ors-amarisoft: Do not give RU more than /64
  stack/slapos: version up slapos.core 1.11.0
parents c24c339c f365a440
...@@ -303,7 +303,7 @@ simplegeneric = 0.8.1 ...@@ -303,7 +303,7 @@ simplegeneric = 0.8.1
singledispatch = 3.4.0.3 singledispatch = 3.4.0.3
six = 1.16.0 six = 1.16.0
slapos.cookbook = 1.0.329 slapos.cookbook = 1.0.329
slapos.core = 1.10.8 slapos.core = 1.11.0
slapos.extension.shared = 1.0 slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.25 slapos.libnetworkcache = 0.25
slapos.rebootstrap = 4.5 slapos.rebootstrap = 4.5
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment