valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,691 Commits 24 Branches 182 Tags 341 MiB
2e8e56ca69
Commit Graph

8 Commits

Author SHA1 Message Date
Ch3LL
23947c5944 change timeout for cloud tests 2016-10-25 13:27:57 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
rallytime
d4ad42d697 Update Joyent Cloud Tests 2015-09-04 12:23:05 -06:00
rallytime
d9d30cc855 Pylint fix 2015-03-05 10:31:13 -07:00
rallytime
dbdc12fe11 Python 3 compat for joyent integration test file 2015-03-04 16:11:45 -07:00
Justin Findlay
cfd03959d5 fix develop lint 2015-03-03 23:28:56 -07:00
rallytime
e26cac4599 Pylint fix 2015-02-24 10:58:39 -07:00
rallytime
b51492486f Add Joyent cloud provider tests 2015-02-20 17:25:07 -07:00