rallytime e61b04a707 Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/cloud/clouds/digital_ocean.py - salt/cloud/clouds/ec2.py - salt/cloud/clouds/libcloud_aws.py - salt/cloud/clouds/opennebula.py - salt/cloud/clouds/rackspace.py - salt/cloud/clouds/softlayer.py - salt/cloud/clouds/softlayer_hw.py - salt/cloud/clouds/vmware.py - salt/loader.py - salt/modules/aptpkg.py - salt/modules/ebuild.py - salt/modules/pacman.py - salt/modules/systemd.py - salt/modules/yumpkg.py - salt/modules/zypper.py - salt/scripts.py - salt/utils/cloud.py		2016-08-18 12:09:51 -06:00
..
clouds	Merge branch '2015.8' into '2016.3'	2016-08-18 12:09:51 -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
libcloud_test.py	fix clrf	2016-08-15 16:30:58 -06:00