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
8623c24335
salt/tests/integration/files/file
History
rallytime 7ea9dacbdd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
  - salt/minion.py
  - salt/modules/win_update.py
  - salt/modules/yumpkg.py
  - salt/utils/pkg/rpm.py
2016-02-18 11:10:44 -07:00
..
base Merge branch '2015.8' into '2016.3' 2016-02-18 11:10:44 -07:00
prod Include the holy directory for the __env__ selection test cases. 2013-11-06 20:04:54 +00:00