From 4b82914c76d19d28d24757b1ccb47f4b24b5baa5 Mon Sep 17 00:00:00 2001
From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Thu, 7 May 2020 13:12:32 +0000
Subject: [PATCH] merge master into v7.0 for v7.1.0

Change-Id: I295bd5c3d0dc31bfec9cbe2b317174dc330eab9d
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---
 osm_lcm/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osm_lcm/__init__.py b/osm_lcm/__init__.py
index d0131019..7fba7de1 100644
--- a/osm_lcm/__init__.py
+++ b/osm_lcm/__init__.py
@@ -13,8 +13,8 @@
 ##
 
 # version moved to lcm.py. uncomment if LCM is installed as library and installed
-version = '7.0.1.post18'
-version_date = '2020-04-08'
+version = '7.1.0.post1'
+version_date = '2020-05-07'
 
 # Try to get version from package using pkg_resources (available with setuptools)
 try:
-- 
2.25.1