Merge 563803e into 46d27d3

nornir-automation · Jul 26, 2018 · a333978 · a333978
2 parents 46d27d3 + 563803e
commit a333978
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/nornir/plugins/connections/napalm.py b/nornir/plugins/connections/napalm.py
@@ -37,9 +37,10 @@ def open(
             "hostname": hostname,
             "username": username,
             "password": password,
-            "timeout": connection_options.get("timeout"),
             "optional_args": connection_options or {},
         }
+        if connection_options.get("timeout"):
+            parameters["timeout"] = connection_options["timeout"]
 
         network_driver = get_network_driver(nos)
         connection = network_driver(**parameters)

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 __author__ = "dbarrosop@dravetech.com"
 __license__ = "Apache License, version 2"
 
-__version__ = "1.1.0"
+__version__ = "2.0.0"
 
 setup(
     name="nornir",