Nicole Thomas
0a19f845ea
Merge pull request #48834 from gtmanfred/slsutil
...
read output of stringio if it is readable
2018-07-31 09:40:47 -04:00
Veenstra
6b1805afc6
Fixed Python 3 incompatibility in methods in nilrt_ip and debian_ip.
2018-07-31 13:08:01 +02:00
sizgiyaev
02d09c6281
Fixed: added additional return code 200 for succeeded api request
2018-07-31 10:34:22 +03:00
Daniel A. Wozniak
9b462394b2
Fix unicode directory listing on py2
2018-07-30 18:55:48 -07:00
Daniel Wallace
f9441d2bef
read output of stringio if it is readable
2018-07-30 19:49:49 -05:00
Daniel Wozniak
69f81214d1
Merge pull request #48714 from dwoz/state_echo_fix
...
Always transfer bytes from fileserver roots
2018-07-30 15:37:12 -07:00
Nicole Thomas
16ca4ec2eb
Merge pull request #48822 from Ch3LL/ssh_2018_id
...
Fix salt-ssh state.sls_id TypeError key must be a string
2018-07-30 16:29:28 -04:00
Daniel A. Wozniak
ce3ed43dab
Always use unix line endings
2018-07-30 11:41:58 -07:00
Ch3LL
01f6a15da0
Fix salt-ssh state.sls_id TypeError key must be a string
2018-07-30 13:10:54 -04:00
Orlando Richards
66936b4f41
Changed string comparison in pip test to match new confirmation string - ref PR #47734 .
2018-07-29 21:32:24 +00:00
Orlando Richards
bb5939d6ef
Merge branch '2017.7' into Issue47689-pip-state-performance
2018-07-29 22:04:23 +01:00
Bo Maryniuk
b00ee5feef
Update clean clause
2018-07-29 22:06:32 +02:00
Bo Maryniuk
b1b2e9c222
Remove multiple returns and combine logic to just one clause
2018-07-29 21:46:21 +02:00
Bo Maryniuk
fd77f760ee
Rephrase explanatory comment
2018-07-29 21:45:40 +02:00
Bo Maryniuk
1031e06443
Remove unnecessary code
2018-07-29 21:45:08 +02:00
Bo Maryniuk
c379b7e4ed
Get rid of global variable
2018-07-29 21:44:46 +02:00
Nicole Thomas
488f6716d4
Merge pull request #48791 from rallytime/bp-48757
...
Back-port #48757 to 2018.3
2018-07-27 17:30:43 -04:00
Nicole Thomas
fae29f4257
Merge pull request #48799 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-07-27 17:30:12 -04:00
Nicole Thomas
2e00939a6e
Merge pull request #48788 from Ch3LL/timezone_windows
...
Add timzeone windows integration tests and fix get_zone
2018-07-27 16:14:29 -04:00
Ch3LL
de95a6a215
add unused import to timezone test file
2018-07-27 15:42:35 -04:00
Ch3LL
41e3d17f29
Use brew path from which cmd in mac_brew module
2018-07-27 15:21:52 -04:00
Ch3LL
22e424859e
add unused import to import
2018-07-27 15:14:14 -04:00
Ch3LL
0840fc3117
disable pylint import error
2018-07-27 14:31:36 -04:00
Nicole Thomas
bd67d2a805
Merge pull request #48765 from FedericoCeratto/fix_mine.get_not_returning_data
...
[2018.3] Fix mine.get not returning data
2018-07-27 14:01:05 -04:00
Daniel Wozniak
d5e60090bc
Merge pull request #2 from terminalmage/state_echo_fix
...
Simplify file contents in roots fileserver test
2018-07-27 10:07:02 -07:00
rallytime
487458ad4b
Update old utils paths to use new utils paths
2018-07-27 11:57:34 -04:00
rallytime
436510796f
Merge branch '2017.7' into '2018.3'
...
No conflicts.
2018-07-27 11:44:07 -04:00
Erik Johnson
52fc1c955d
Simplify file contents in roots fileserver test
...
This removes the need to hard code contents in the test. The roots
fileserver just reads from the file in binary mode, so we should be able
to do the same in the test to confirm the correct behavior of the roots
backend.
2018-07-27 09:16:59 -05:00
Erik Johnson
b6f73e8e57
Remove trailing whitespace on what should be a blank line
2018-07-27 09:15:05 -05:00
Nicole Thomas
8e61f3dce0
Merge pull request #48742 from frogunder/45014
...
add windows integration tests for states.file
2018-07-27 09:57:26 -04:00
Ch3LL
d3b7f2cb18
Remove fake su used in integration tests
2018-07-27 09:36:23 -04:00
Nicole Thomas
d74f47b340
Merge pull request #48795 from rallytime/fix-48417
...
Update linting docs to contain .testing.pylintrc use
2018-07-27 09:34:12 -04:00
rallytime
5123b17ffd
Update linting docs to contain .testing.pylintrc use
...
The PR tests use the ``.testing.pylintrc`` file, rather than the
more restrictive ``.pylintrc`` file. This can be a point of confusion
when following the current documentation.
The docs should reference the testing file and that the Jenkins PR
tests use ``.testing.pylintrc`` instead of ``.pylintrc``.
Fixes #48417
2018-07-27 09:09:28 -04:00
Federico Ceratto
7183a6e0e8
Workaround for #48020
2018-07-27 09:48:46 +00:00
Nicole Thomas
bbea9ae936
Merge pull request #48789 from rallytime/bp-48783
...
Back-port #48783 to 2017.7
2018-07-26 17:47:48 -04:00
kuetrzi
f440ebe91f
Update carbon_return.py
...
fix TypeError: not all arguments converted during string formatting
caused by extra comma accidentally being added to log statement in unicode literals update
2018-07-26 17:29:17 -04:00
William Giokas
682a05bebe
Threshold was wrong
...
I also removed the delta value check. It's going to be weird with the
number of runs we do, and it's also set to run on failures.
2018-07-26 17:27:02 -04:00
William Giokas
d4ca0e3a97
test: except for OSError only
2018-07-26 17:27:02 -04:00
William Giokas
4547231909
Only run lint checks against changed files
2018-07-26 17:27:02 -04:00
Nicole Thomas
41464d4b39
Merge pull request #48731 from zer0def/virt-runner-init-args
...
Fixed `enable_vnc` runner arg being passed into `seed_cmd` module arg in `virt.init`.
2018-07-26 17:13:58 -04:00
Ch3LL
f09d1a2c7e
Add timzeon windows integration tests and fix get_zone
2018-07-26 16:44:55 -04:00
Frode Gundersen
f08058b043
Merge branch '45014' of https://github.com/frogunder/salt into 45014
2018-07-26 20:09:17 +00:00
Frode Gundersen
33c20c1ec0
fix tests
2018-07-26 20:04:51 +00:00
Nicole Thomas
6978ce5d1d
Merge pull request #48747 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-07-26 14:14:33 -04:00
Nicole Thomas
5ea43817ab
Merge pull request #48771 from gtmanfred/2018.3
...
only do reverse dns lookup on ips for salt-ssh
2018-07-26 11:41:40 -04:00
Nicole Thomas
f2ef2d3ef6
Merge pull request #48752 from garethgreenaway/fix_state_file_all_integers
...
[2018.3] Fix when state file is integers
2018-07-25 11:03:01 -04:00
Nicole Thomas
030c921914
Merge pull request #48754 from lomeroe/fix-tornado-proxy
...
send proxy/ca_cert parameters as strings (not unicode) to tornado httpclient
2018-07-25 10:55:42 -04:00
Daniel Wallace
535fb8f8e7
only do reverse dns lookup on ips for salt-ssh
...
Fixes #48676
2018-07-25 09:48:29 -05:00
Nicole Thomas
1eee4b136b
Merge pull request #48769 from Ch3LL/update_doc_2018.3
...
Update Saltstack Logo banner on docs.saltstack.com
2018-07-25 10:47:19 -04:00
Ch3LL
0cb4bac798
Update Saltstack Logo banner on docs.saltstack.com
2018-07-25 10:41:43 -04:00
