Colton Myers efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/topics/cloud/vmware.rst salt/cloud/clouds/vmware.py salt/grains/chronos.py salt/grains/marathon.py salt/loader.py salt/modules/chronos.py salt/modules/marathon.py salt/proxy/chronos.py salt/proxy/marathon.py salt/state.py salt/states/chronos_job.py salt/states/marathon_app.py salt/states/user.py salt/utils/schedule.py		2015-11-13 15:18:45 -07:00
..
index.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
master.rst	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-11-12 12:33:27 -07:00
minion.rst	Bug fixes and build errors	2015-06-05 17:32:35 -06:00
yaml_idiosyncrasies.rst	Adding double quote notes	2015-10-22 12:39:14 -06:00