projects / osm / osmclient.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e7a3182 09bb613)
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)
commit80ef8571ea21900bce2d73554c56b1ccbf4c7072
tree0be6e6871413b44b7c8b8b9b911237136dff6303tree | snapshot
parente7a3182804a91801b749bdf8b402dca2fbce3374commit | diff
parent09bb6134d43ca1449fbc2ccf7430de0da4f1e109commit | diff
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>