Merge branch 'master' into og-api-tokens-simple

2019-03-15 12:31:52 +00:00
parent 25d46c0b40 9b947369f9
commit 20f4704fe2
19 changed files with 309 additions and 59 deletions
--- a/share/config.yml
+++ b/share/config.yml
@@ -217,6 +217,7 @@ device_identity: []
 community: []
 community_rw: []
 device_auth: []
+use_legacy_sshcollector: false
 get_credentials: ""
 bulkwalk_off: false
 bulkwalk_no: []
@@ -416,7 +417,6 @@ worker_plugins:
  - 'Vlan::Core'

 extra_worker_plugins: []
-#  - Discover::ConfigBackup::CLI

 driver_priority:
  restconf: 500