From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Thu, 7 May 2020 14:15:22 +0000 (+0000)
Subject: Merge 'master' into v7.0 for v7.1.0
X-Git-Tag: v7.1.0rc1~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=b57ab5c6efefcf4389af2f58a50908e26a3b3759;p=osm%2FRO.git

Merge 'master' into v7.0 for v7.1.0

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

b57ab5c6efefcf4389af2f58a50908e26a3b3759
diff --cc RO/osm_ro/openmanod.py
index 81ea96f1,93aca893..3ba3db9b
--- a/RO/osm_ro/openmanod.py
+++ b/RO/osm_ro/openmanod.py
@@@ -53,8 -53,8 +53,8 @@@ import osm_r
  
  __author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes"
  __date__ = "$26-aug-2014 11:09:29$"
- __version__ = "7.0.0.post13"
- version_date = "Jan 2019"
 -__version__ = "7.0.1.post26"
++__version__ = "7.1.0.post1"
+ version_date = "May 2020"
  database_version = 40      # expected database schema version
  
  global global_config