Commit Graph

4 Commits

Author SHA1 Message Date
Jacob Hammons
53d17f1f85 Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com" 2016-01-12 13:37:09 -07:00
Colton Myers
bd6ecdfd43 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
    salt/pillar/pepa.py
    salt/states/artifactory.py
    salt/states/pip_state.py
    salt/transport/__init__.py
2015-04-21 10:42:22 -06:00
Justin Findlay
7899914dbe fix deprecated artifactory state code 2015-04-21 08:38:23 -06:00
Jayesh Kariya
446121750d adding states/artifactory unit test case 2015-04-20 16:02:46 +05:30