valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,855 Commits 24 Branches 182 Tags 341 MiB
db7b675b09
Commit Graph

4 Commits

Author SHA1 Message Date
Colton Myers
cca8ddc886 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    .testing.pylintrc
    salt/auth/pam.py
    salt/modules/win_status.py
    salt/utils/network.py
    salt/utils/schedule.py
    tests/unit/renderers/gpg_test.py
    tests/unit/states/boto_secgroup.py
 2015-04-29 12:01:52 -06:00
Pedro Algarvio
c5a34176e5 Fix imports 2015-04-26 10:53:36 +01:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Colin Johnson
2ad52a5c06 LYFT-14491 - states unit test for rule modification 2014-07-23 22:59:28 +00:00