mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +00:00
c4f5e231fa
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
|
||
|---|---|---|
| .. | ||
| rest_cherrypy | ||
| rest_tornado | ||
| __init__.py | ||
| test_client.py | ||