rallytime 16a2747d7d Merge branch '2016.11' into '2017.7' ... Conflicts: - pkg/windows/buildenv/salt.bat - salt/modules/pillar.py - salt/utils/openstack/nova.py - tests/unit/cloud/clouds/test_dimensiondata.py - tests/unit/cloud/clouds/test_gce.py		2017-06-14 13:31:42 -06:00
..
clouds	Merge branch '2016.11' into '2017.7'	2017-06-14 13:31:42 -06:00
__init__.py	make saltify to use standard boostrap procedure, therefore providing all options like master_sign_pub_file	2015-05-17 18:16:43 +02:00
test_libcloud.py	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00