From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 4 Feb 2020 21:17:18 +0000 (+0100)
Subject: Merge branch 'master' into v7.0
X-Git-Tag: v7.0.1^0
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F8561%2F1;p=osm%2Fosmclient.git

Merge branch 'master' into v7.0

* 09bb613 fix 1006 command wim-show tries to load json twice
* 3a46354 osm.py: --long option for ns-op-list
* 0a2a4d4 osm.py: improved help message for some commands
* b94720f ns-list --details: renamed to --long; added instantiation date, added project and vim id

Change-Id: I677134e39606332a5df4f6f64103b619643bb45c
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

80ef8571ea21900bce2d73554c56b1ccbf4c7072