mirror of
https://github.com/valitydev/salt.git
synced 2024-11-09 01:36:48 +00:00
73d73e80c1
Conflicts: - doc/topics/releases/2015.8.4.rst - doc/topics/releases/2015.8.5.rst - doc/topics/thorium/index.rst - salt/cloud/clouds/opennebula.py - salt/engines/thorium.py - salt/loader.py - salt/modules/archive.py - salt/modules/boto_vpc.py - salt/modules/data.py - salt/modules/reg.py - salt/pillar/mysql.py - salt/runners/cache.py - salt/states/archive.py - salt/states/cron.py - salt/states/file.py - salt/states/glance.py - salt/states/reg.py - salt/thorium/__init__.py - salt/thorium/check.py - salt/thorium/file.py - salt/thorium/reg.py - salt/utils/jid.py - salt/utils/parsers.py - setup.py |
||
---|---|---|
.. | ||
cloud.maps.d | ||
cloud.profiles.d | ||
cloud.providers.d | ||
cloud | ||
cloud.profiles | ||
cloud.providers | ||
master | ||
minion | ||
proxy | ||
roster |