From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Fri, 16 Nov 2018 23:25:46 +0000 (+0100)
Subject: Merge branch 'netslice'
X-Git-Tag: v5.0.0~8
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=8a0d6caa091700066ed8ceed1cda8495df547909;p=osm%2FLCM.git

Merge branch 'netslice'

Change-Id: Id030ead323e2a89acb43e8c7352b9b50d5717f17
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

8a0d6caa091700066ed8ceed1cda8495df547909
diff --cc Dockerfile.local
index 65c7ce1,e5bdb86..dcef067
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@@ -19,7 -19,7 +19,7 @@@ FROM ubuntu:16.0
  WORKDIR /app/osm_lcm
  
  # Copy the current directory contents into the container at /app
- ADD . /app
 -#ADD . /app
++ADD . /app  # TODO move to the end
  
  RUN apt-get update && apt-get install -y git tox python3 \
      python3-pip python3-aiohttp \
@@@ -82,6 -82,8 +82,8 @@@ ENV OSMLCM_MESSAGE_PORT    909
  ENV OSMLCM_GLOBAL_LOGFILE  /app/log/lcm.log
  ENV OSMLCM_GLOBAL_LOGLEVEL DEBUG
  
 -ADD . /app
++# ADD . /app
+ 
  # Run app.py when the container launches
  CMD ["python3", "lcm.py"]
  
diff --cc osm_lcm/lcm.py
index 39a254b,d4a09db..ff90ff1
--- a/osm_lcm/lcm.py
+++ b/osm_lcm/lcm.py
@@@ -27,8 -28,8 +28,8 @@@ min_RO_version = [0, 5, 72
  min_n2vc_version = "0.0.2"
  min_common_version = "0.1.11"
  # uncomment if LCM is installed as library and installed, and get them from __init__.py
--lcm_version = '0.1.23'
--lcm_version_date = '2018-11-13'
++lcm_version = '0.1.24'
++lcm_version_date = '2018-11-16'
  
  
  class Lcm: