From 3179303a5dcafca380ecb6626b5df03352613d87 Mon Sep 17 00:00:00 2001
From: Mike Place <mp@saltstack.com>
Date: Thu, 20 Oct 2016 19:49:45 +0900
Subject: [PATCH] Revert "Back-port #36875 to carbon"

---
 .gitignore                    | 1 -
 tests/integration/__init__.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50cc313e5bd..b256026f368 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,7 +49,6 @@ htmlcov/
 /*.iml
 *.sublime-project
 *.sublime-workspace
-/.vscode
 
 # ignore ctags file
 tags
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
index d6f96c0b49c..185c6967566 100644
--- a/tests/integration/__init__.py
+++ b/tests/integration/__init__.py
@@ -618,7 +618,7 @@ class SaltDaemonScriptBase(SaltScriptBase, ShellTestCase):
                                 pass
                     del sock
                 elif isinstance(port, str):
-                    joined = self.run_run('manage.joined')
+                    joined = self.run_run('manage.joined', config_dir=self.config_dir)
                     joined = [x.lstrip('- ') for x in joined]
                     if port in joined:
                         check_ports.remove(port)