Colton Myers 76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/topics/cloud/vmware.rst salt/cloud/clouds/digital_ocean_v2.py salt/cloud/clouds/vmware.py salt/daemons/flo/core.py salt/modules/hipchat.py salt/modules/lxc.py salt/modules/rabbitmq.py salt/pillar/s3.py salt/states/dockerio.py salt/states/file.py salt/utils/process.py salt/utils/s3.py		2015-07-20 13:55:14 -06:00
..
__init__.py	Don't forget the blank lines at the end of the file	2015-04-24 16:29:51 -06:00
test_app.py	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-20 13:55:14 -06:00