Merge branch '2017.7' into windows_pr_builds

salt/modules/consul.py

@@ -2164,7 +2164,7 @@ def acl_info(consul_url=None, **kwargs):
     function = 'acl/info/{0}'.format(kwargs['id'])
     ret = _query(consul_url=consul_url,
                  data=data,
-                 method='PUT',
+                 method='GET',
                  function=function)
     return ret
 

tests/integration/modules/test_pkg.py

@@ -324,7 +324,10 @@ class PkgModuleTest(ModuleCase, SaltReturnAssertsMixin):
             if ret == '' or ret == {}:
                 self.skipTest('No updates available for this machine.  Skipping pkg.upgrade test.')
             else:
-                ret = self.run_function(func)
+                args = []
+                if os_family == 'Debian':
+                    args = ['dist_upgrade=True']
+                ret = self.run_function(func, args)
 
                 if 'Problem encountered' in ret:
                     self.skipTest('A problem was encountered when running pkg.upgrade. This test is '

tests/whitelist.txt

@@ -7,10 +7,8 @@ integration.client.test_standard
 integration.client.test_syndic
 integration.doc.test_man
 integration.grains.test_core
-integration.grains.test_custom
 integration.loader.test_ext_grains
 integration.loader.test_ext_modules
-integration.logging.test_jid_logging
 integration.minion.test_blackout
 integration.minion.test_pillar
 integration.minion.test_timeout