mirror of
https://github.com/valitydev/salt.git
synced 2024-11-09 01:36:48 +00:00
efb479a1bd
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 |
||
---|---|---|
.. | ||
dev.rst | ||
index.rst |