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
..
clouds	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	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