Colton Myers 278e8dda5b Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/cloud/clouds/gce.py		2015-09-01 15:15:13 -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
linode_test.py	Whitespace fix	2015-08-27 11:41:14 -06:00
opennebula_test.py	Pylint fix	2015-08-11 09:23:28 -06:00
saltify_test.py	fixing problem in unit test	2015-05-17 17:09:35 +00:00
vmware_test.py	Lint fix	2015-08-21 06:46:41 -04:00