rallytime c3ecefc785

Merge branch '2017.7' into '2018.3' ...

Conflicts:
  - salt/modules/file.py
  - salt/modules/win_service.py
  - salt/states/mount.py
  - salt/states/service.py
  - tests/integration/__init__.py
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/unit/states/test_file.py

2018-08-23 11:50:41 -04:00

11 MiB

Raw Blame History

The file is too large to be shown.