Colton Myers c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 ... Conflicts: doc/_themes/saltstack2/layout.html doc/conf.py doc/index.rst doc/ref/modules/all/salt.modules.hipchat.rst doc/topics/releases/index.rst salt/client/ssh/client.py salt/cloud/clouds/vsphere.py salt/modules/boto_dynamodb.py salt/modules/boto_route53.py salt/modules/data.py salt/modules/http.py salt/modules/tls.py salt/output/compact.py salt/states/boto_elb.py salt/states/linux_acl.py salt/states/rabbitmq_user.py salt/states/win_servermanager.py salt/utils/dictupdate.py salt/wheel/config.py		2015-05-29 15:10:13 -06:00
..
__init__.py	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00
fileserver.py	Merge branch '2015.2' into 2015.2-develop	2015-03-10 17:47:30 -05:00
jobs.py	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2	2015-05-29 15:10:13 -06:00
manage.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
state.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00