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

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

diff --git a/osm_nbi/__init__.py b/osm_nbi/__init__.py
index 7bd5b6b..8b1299c 100644
--- a/osm_nbi/__init__.py
+++ b/osm_nbi/__init__.py
@@ -12,8 +12,8 @@
 # under the License.
 ##
 
-version = '7.0.1.post23'
-version_date = '2020-04-17'
+version = '7.1.0.post1'
+version_date = '2020-05-05'
 
 # Obtain installed package version. Ignore if error, e.g. pkg_resources not installed
 try:
-- 
2.25.1