Merge "Fix intermittent ipset_manager test failure"

diff --cc neutron/agent/linux/ipset_manager.py
Simple merge

diff --cc neutron/tests/unit/agent/linux/test_ipset_manager.py
index a06aea5de14f46d216601abbd2b743d28a5d082e,ff6010b5f9166c954c8541529654d07ec5e43ebc..e449308b50efbbd6d01e393b1d004a45447cab61
--- 1/neutron/tests/unit/agent/linux/test_ipset_manager.py
--- 2/neutron/tests/unit/agent/linux/test_ipset_manager.py
+++ b/neutron/tests/unit/agent/linux/test_ipset_manager.py
@@@ -26,8 -27,9 +26,8 @@@ FAKE_IPS = ['10.0.0.1', '10.0.0.2', '10
  
  
  class BaseIpsetManagerTest(base.BaseTestCase):
-     def setUp(self, maxelem=None, hashsize=None):
+     def setUp(self, maxelem, hashsize):
          super(BaseIpsetManagerTest, self).setUp()
 -        cfg.CONF.register_opts(a_cfg.IPSET_OPTS, 'AGENT')
          cfg.CONF.set_override('ipset_maxelem', maxelem, 'AGENT')
          cfg.CONF.set_override('ipset_hashsize', hashsize, 'AGENT')
          self.maxelem = maxelem