rallytime 2cd0c5e4ec Merge branch '2016.11' into 'nitrogen' ... Conflicts: - doc/topics/cloud/azurearm.rst - salt/cloud/clouds/vultrpy.py - salt/modules/aptpkg.py - salt/modules/dockermod.py - tests/unit/modules/dockerng_test.py - tests/unit/modules/test_pillar.py		2017-04-10 14:09:25 -06:00
..
helpers	Import from the original modules not tests.integration	2017-04-04 18:58:19 +01:00
providers	Merge branch '2016.11' into 'nitrogen'	2017-04-10 14:09:25 -06:00
__init__.py	salt-cloud tests for linode	2014-06-09 14:49:49 -06:00