rallytime
aefa1dbe21
Fix up bad merge - remove extra section of "mode" changes
...
This came through in a merge-forward due to #48398 and #48399
Both PRs moved the "mode" section in file.check_perms down lower,
but when the merge-forward went through, the section got added
back again.
2018-07-10 13:53:34 -04:00
Raine Curtis
1556b37221
fixed pylint errors
2018-07-10 11:30:43 -06:00
Raine Curtis
f6d9177dab
fixed indentation for pep8
2018-07-10 11:30:43 -06:00
Raine Curtis
b9556bf923
v2 try of gid converted to integer
2018-07-10 11:30:43 -06:00
Jerzy Drozdz
b9ddd53b04
Added comments
2018-07-10 09:20:36 -04:00
Jerzy Drozdz
f3517a1852
List comprehension replaced
2018-07-10 09:20:31 -04:00
Jerzy Drozdz
adfa3aed0d
Empty match on delete or replace not causing IndexError exception
2018-07-10 09:20:23 -04:00
Jerzy Drozdz
5169b1f7fd
Comprehensions converting to unicode replaced by salt.utils.data.decode_list
2018-07-10 09:20:18 -04:00
Jerzy Drozdz
d3e8679e05
Removed regex compilation
2018-07-10 09:20:10 -04:00
Jerzy Drozdz
f29815b49b
Fixed file permissions
2018-07-10 09:20:04 -04:00
Jerzy Drozdz
d2af81e9c7
Make integration green. Added test for mode ensure insert before first line
2018-07-10 09:19:55 -04:00
Jerzy Drozdz
9b7df671a5
file.line function refactored
2018-07-10 09:18:20 -04:00
Jerzy Drozdz
3af551ebe1
/sr.* pattern should raise exception
2018-07-10 09:17:49 -04:00
Jerzy Drozdz
935a9b9d56
test_line_insert_end fixed
2018-07-10 09:14:18 -04:00
Jerzy Drozdz
7d6e3ad2e2
Make tests green
2018-07-10 09:14:12 -04:00
Jerzy Drozdz
75a7e368a6
Setting end of line
2018-07-10 09:14:06 -04:00
Jerzy Drozdz
489e381100
Added _set_line_eol and _get_eol functions
2018-07-10 09:13:46 -04:00
JerzyX Drozdz
aacbb8c0e2
line function refactored to work on list
2018-07-10 09:11:59 -04:00
JerzyX Drozdz
de668166f9
_regex_to_static refactored to work on lists
2018-07-10 09:11:54 -04:00
JerzyX Drozdz
464eef6fe1
_get_line_indent renamed to _set_line_indent
2018-07-10 09:11:38 -04:00
Nicole Thomas
f9fd1a889a
Merge pull request #48495 from garethgreenaway/48342_mysql_cache_unicode
...
[2018.3] Fix to mysql cache module
2018-07-10 08:54:10 -04:00
Nicole Thomas
16d3daab3c
Merge pull request #48375 from Ch3LL/file_copy
...
Add user and group to makedirs cmd in file.copy
2018-07-10 08:35:10 -04:00
Gareth J. Greenaway
0029f19033
Ensure the query_string is a bytestring, otherwise an attempt will be made to convert the msgpack data to unicode which will result in a UnicodeDecodeError error.
2018-07-09 17:45:23 -07:00
Ch3LL
d16a790775
Add mode to _makedirs call in file.copy
2018-07-09 15:47:37 -04:00
Nicole Thomas
fc3eeef6b3
Merge pull request #48487 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-07-09 14:37:59 -04:00
Daniel Wallace
d38951b1b3
Merge pull request #48490 from KaiSforza/cifixes
...
Cifixes
2018-07-09 10:20:46 -05:00
William Giokas
9fe7199af5
Mark failed if anything is found
2018-07-09 09:06:31 -06:00
William Giokas
6749a6bf19
Stop archiving the docs
...
This is just taking up space
2018-07-09 09:04:14 -06:00
rallytime
54341d1a8d
Update old utils paths to use new utils paths
2018-07-09 10:34:38 -04:00
rallytime
68aabff0cf
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- pkg/windows/req.txt
- salt/netapi/rest_tornado/saltnado.py
- salt/utils/versions.py
- tests/integration/states/test_file.py
2018-07-09 10:27:58 -04:00
Nicole Thomas
4d4d2eacce
Merge pull request #48481 from terminalmage/slack-engine
...
Improve the slack engine docs
2018-07-09 09:41:14 -04:00
Erik Johnson
56e8a1eb93
Improve the slack engine docs
...
This explains the target/tgt_type options, adds some usage examples, and
makes a few other documentation tweaks.
2018-07-07 21:41:01 -05:00
Erik Johnson
dde9c0640d
Add information on creating bot users
2018-07-07 11:28:25 -05:00
Erik Johnson
513c6af975
Fix inaccurate docs
2018-07-07 11:03:31 -05:00
Daniel Wallace
22cd4206c4
Merge pull request #48472 from gtmanfred/2017.7
...
use tox to run pylint
2018-07-06 21:46:46 -05:00
Mike Place
27ea8f35ea
Merge pull request #48476 from twangboy/fix_dependencies
...
Fix dependencies
2018-07-06 17:43:25 -06:00
twangboy
b0087d425c
Add license info
2018-07-06 15:55:14 -06:00
twangboy
935f9b560c
Fix dependencies
...
Adds back libnacl
Adds back libsodium.dll
Adds new python-certifi-win32
2018-07-06 15:46:57 -06:00
Daniel Wozniak
491b5b077c
Merge pull request #48348 from dwoz/test_git
...
Fix multiple git module tests
2018-07-06 13:35:57 -07:00
Daniel Wozniak
5ca5e060b3
Merge branch '2018.3' into test_git
2018-07-06 12:11:53 -07:00
Daniel Wallace
c7a3a7d8bd
update jenkins tests to use tox for lint
2018-07-06 13:35:06 -05:00
Daniel Wallace
44aaac1d33
use tox to run pylint
...
Also allow pylint to be run from a virtualenv
2018-07-06 13:25:08 -05:00
Nicole Thomas
dd6a6a97c5
Merge pull request #48454 from terminalmage/issue48107
...
Improve error message when ext_pillar is incorrectly formatted
2018-07-06 14:03:43 -04:00
Nicole Thomas
a9dc758e73
Merge pull request #48398 from garethgreenaway/48336_ensure_chmodd_setuid_with_chown
...
[2018.3] fixes to module/file.py
2018-07-06 14:02:42 -04:00
Nicole Thomas
acf42864aa
Merge pull request #48399 from garethgreenaway/48336_2017_7_ensure_chmod_setuid_with_chown
...
[2017.7] fixes to module/file.py
2018-07-06 14:02:29 -04:00
Daniel Wallace
6166ff6b78
Merge pull request #48471 from gtmanfred/2017.7
...
Add some configurations to tox
2018-07-06 12:45:54 -05:00
Daniel Wallace
392ab4e51f
Add some configurations to tox
2018-07-06 12:45:12 -05:00
Nicole Thomas
6234d9b15d
Merge pull request #48433 from discogestalt/fix-redis.hmset
...
Fix issue with redismod.hmset method
2018-07-06 11:55:43 -04:00
Nicole Thomas
aacee0fe2c
Merge pull request #48428 from terminalmage/fix-jobs.lookup_jid
...
Fix outputter detection in jobs.lookup_jid runner
2018-07-06 10:37:36 -04:00
Mark Troyer
65817ac74d
Use clean_kwargs method instead
2018-07-05 13:56:02 -07:00
