valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2014.7' into develop

Browse Source 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
This commit is contained in:
Pedro Algarvio 2014-12-02 01:09:15 +00:00
commit b37c76a800
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/unit/modules/boto_vpc_test.py
View File

@ -1450,6 +1450,5 @@ class BotoVpcRouteTablesTestCase(BotoVpcTestCaseBase):
if __name__ == '__main__':
from integration import run_tests
from integration import run_tests # pylint: disable=import-error
run_tests(BotoVpcTestCase, needs_daemon=False)