projects / osm / RO.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9256900 df6f9b1)
Merge 'master' into v7.0 for v7.1.0 79/8879/2
authortierno <alfonso.tiernosepulveda@telefonica.com>
Thu, 7 May 2020 14:15:22 +0000 (14:15 +0000)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Thu, 7 May 2020 14:34:58 +0000 (14:34 +0000)
Change-Id: Icf8af24c306a5714dbbaa2d71a06cf6f0fd0ca91
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
1  2 
RO/osm_ro/openmanod.py patch | diff1 | diff2 | blob | history
RO/osm_ro/wim/persistence.py patch | diff1 | diff2 | blob | history

diff --cc RO/osm_ro/openmanod.py
index 81ea96f,93aca89..3ba3db9
--- 1/RO/osm_ro/openmanod.py
--- 2/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
diff --cc RO/osm_ro/wim/persistence.py
Simple merge