rallytime 0ad101d560

Merge branch '2017.7' into 'oxygen' ...

Conflicts:
  - doc/man/salt.7
  - salt/modules/git.py
  - salt/modules/pacman.py
  - salt/states/git.py
  - tests/integration/modules/test_mac_user.py
  - tests/support/parser/__init__.py

2018-01-26 17:27:03 -05:00

9.5 MiB

Raw Blame History

The file is too large to be shown.