valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73282d51cc
salt/tests/integration/netapi
History
Colton Myers 76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
2015-07-20 13:55:14 -06:00
..
rest_cherrypy Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-04-27 10:28:53 -06:00
rest_tornado Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-07-20 13:55:14 -06:00
__init__.py Fix lint errors 2014-10-08 01:02:11 +01:00
test_client.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-04-16 12:15:44 -06:00