mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 08:58:59 +00:00
53bab586f4
Woot! The conflicts below are intentional because they contained salt-api-isms that needed to be included into the corresponding Salt files. Conflicts: debian/changelog debian/control doc/conf.py doc/index.rst opt_requirements.txt salt/config.py salt/loader.py |
||
|---|---|---|
| .. | ||
| salt-api.1 | ||
| salt-api.7 | ||
| salt-call.1 | ||
| salt-cloud.1 | ||
| salt-cp.1 | ||
| salt-key.1 | ||
| salt-master.1 | ||
| salt-minion.1 | ||
| salt-run.1 | ||
| salt-ssh.1 | ||
| salt-syndic.1 | ||
| salt.1 | ||
| salt.7 | ||