Pylint fix for develop

salt/config.py

@@ -544,8 +544,6 @@ DEFAULT_MASTER_OPTS = {
     'log_granular_levels': {},
     'pidfile': os.path.join(salt.syspaths.PIDFILE_DIR, 'salt-master.pid'),
     'publish_session': 86400,
-    'cluster_masters': [],
-    'cluster_mode': 'paranoid',
     'range_server': 'range:80',
     'reactor': [],
     'reactor_refresh_interval': 60,

salt/daemons/flo/core.py

@@ -102,7 +102,6 @@ class SaltRaetCleanup(ioflo.base.deeding.Deed):
                     raise
 
 
-
 class SaltRaetRoadClustered(ioflo.base.deeding.Deed):
     '''
     Updates value of share .salt.road.manor.cluster.clustered
@@ -332,6 +331,7 @@ class SaltRaetRoadStackCloser(ioflo.base.deeding.Deed):
         if self.stack.value and isinstance(self.stack.value, RoadStack):
             self.stack.value.server.close()
 
+
 class SaltRaetRoadStackJoiner(ioflo.base.deeding.Deed):
     '''
     Initiates join transaction with master(s)

salt/modules/tuned.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 '''
 :maintainer:    Syed Ali <alicsyed@gmail.com>
 :maturity:      new
@@ -14,6 +15,7 @@ __func_alias__ = {
 
 __virtualname__ = 'tuned'
 
+
 def __virtual__():
     '''
     Check to see if tuned-adm binary is installed on the system
@@ -95,4 +97,4 @@ def profile(profile_name):
     result = __salt__['cmd.retcode']('tuned-adm profile {0}'.format(profile_name))
     if int(result) != 0:
         return False
-    return '{0}'.format(profile_name)
+    return '{0}'.format(profile_name)

salt/states/tuned.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 '''
 :maintainer:    Syed Ali <alicsyed@gmail.com>
 :maturity:      new
@@ -7,6 +8,7 @@
 
 import salt.exceptions
 
+
 def profile(name):
     '''
     This state module allows you to modify system tuned parameters

salt/utils/http.py

@@ -100,7 +100,6 @@ def query(url,
         else:
             opts = {}
 
-
     if requests_lib is None:
         requests_lib = opts.get('requests_lib', False)