Merge "Changing the poll_duration parameter type to int"

diff --cc etc/neutron/plugins/cisco/cisco_plugins.ini
Simple merge

diff --cc neutron/plugins/cisco/common/config.py
index c3f25093e04b3a67c38093beb1312a3a4643ce8a,255a42d9908a2ee887b4d766f2d6a49901c6ffe6..f13569cea6d001612864d07a60e63b5dddf8f7ba
--- 1/neutron/plugins/cisco/common/config.py
--- 2/neutron/plugins/cisco/common/config.py
+++ b/neutron/plugins/cisco/common/config.py
@@@ -78,10 -78,8 +78,10 @@@ cisco_n1k_opts = 
                 help=_("N1K default policy profile")),
      cfg.StrOpt('network_node_policy_profile', default='dhcp_pp',
                 help=_("N1K policy profile for network node")),
-     cfg.StrOpt('poll_duration', default='10',
+     cfg.IntOpt('poll_duration', default=10,
                 help=_("N1K Policy profile polling duration in seconds")),
 +    cfg.IntOpt('http_pool_size', default=4,
 +               help=_("Number of threads to use to make HTTP requests")),
  ]
  
  cfg.CONF.register_opts(cisco_opts, "CISCO")

diff --cc neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py
Simple merge