rallytime 7bf9f5d0f5 Merge branch '2016.3' into 'develop' ... Conflicts: - doc/man/salt.7 - doc/ref/executors/all/salt.executors.direct_call.rst - doc/ref/executors/all/salt.executors.splay.rst - doc/ref/executors/all/salt.executors.sudo.rst - salt/cloud/clouds/vultrpy.py		2016-05-18 09:40:48 -06:00
..
helpers	Remove unused param	2016-02-12 18:36:33 +01:00
providers	Merge branch '2016.3' into 'develop'	2016-05-18 09:40:48 -06:00
__init__.py	salt-cloud tests for linode	2014-06-09 14:49:49 -06:00