rallytime 7b3fc41868 Merge branch '2016.3' into 'develop' ... Conflicts: - salt/cloud/clouds/lxc.py - salt/cloud/clouds/nova.py - salt/cloud/clouds/vmware.py - salt/cloud/clouds/vsphere.py - salt/cloud/libcloudfuncs.py - salt/minion.py - salt/modules/yumpkg.py - salt/utils/cloud.py		2016-08-18 14:37:42 -06:00
..
clouds	Merge branch '2016.3' into 'develop'	2016-08-18 14:37: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
libcloud_test.py	fix clrf	2016-08-15 16:30:58 -06:00