Merge branch 'master' into v7.0 61/8561/1 v7.0.1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Tue, 4 Feb 2020 21:17:18 +0000 (22:17 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Tue, 4 Feb 2020 21:18:09 +0000 (22:18 +0100)
* 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>

Trivial merge