Colton Myers
|
f00465a8a1
|
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
doc/topics/event/index.rst
salt/loader.py
salt/modules/config.py
salt/modules/cyg.py
salt/modules/hg.py
salt/modules/lxc.py
salt/modules/upstart.py
salt/states/hg.py
salt/utils/cloud.py
salt/utils/dictupdate.py
salt/utils/schedule.py
tests/integration/fileserver/gitfs_test.py
tests/unit/pydsl_test.py
|
2015-02-18 11:55:29 -07:00 |
|
Colton Myers
|
b2a80b195e
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
|
2015-02-12 11:44:57 -07:00 |
|
rallytime
|
6b2d64b557
|
Fix second pylint error that popped up
|
2015-02-11 22:07:37 -07:00 |
|
rallytime
|
789570fb94
|
Fix pylint/syntax of test in which_test to merge #20419
|
2015-02-11 21:48:34 -07:00 |
|
Hung Nguyen Viet
|
d10ce3ade2
|
fix unittest for windows
|
2015-02-12 01:37:40 +07:00 |
|
Pedro Algarvio
|
60f215f191
|
Add from __future__ import absolute_import
|
2015-01-30 22:25:04 +00:00 |
|
sjwehry
|
342608d9bd
|
Fixed spelling of "below" in 9 different files.
|
2015-01-06 19:55:28 -05:00 |
|
Anthony Scalisi
|
44963fae0e
|
fix various typos
|
2014-12-08 14:32:53 -08:00 |
|
Pedro Algarvio
|
798e1830d5
|
Provide a default PATHEXT environment variable.
Added test case which relies on the `PATHEXT` environment variable.
|
2013-10-28 16:05:19 +00:00 |
|
Pedro Algarvio
|
c8c6dab678
|
Add some comments to explain whats going on.
|
2013-10-27 16:53:39 +00:00 |
|
Pedro Algarvio
|
79391f107b
|
Provide a mocked version the tests to reach windows specific code.
|
2013-10-27 16:53:39 +00:00 |
|
Erik Johnson
|
a9d1c12481
|
Add unit test for salt.utils.which
This is a Linux-only test, it will need some mock love to make it
suitable to test for windows paths.
|
2013-10-27 16:53:39 +00:00 |
|