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
..
dev.rst	Fix typo an managment -> management	2015-11-04 10:59:22 +01:00
index.rst	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-13 15:18:45 -07:00