Erik Johnson
15296e59a5
Add debug logging to SSHCase
2017-12-19 12:09:35 -06:00
Erik Johnson
fa66e54dd6
Pass through SLS opts to compile_state
2017-12-19 12:09:35 -06:00
Erik Johnson
aecbd151aa
Fix incorrect use of six.string_types
2017-12-19 12:09:35 -06:00
Erik Johnson
387378c4b6
Properly support pillarenv in docker.sls_build
2017-12-19 12:09:35 -06:00
Erik Johnson
76a7c0b593
docker_image: Fix missing exc in except, pass proper args to docker.build
2017-12-19 12:09:35 -06:00
Nicole Thomas
f311c6a700
Merge pull request #43296 from lyft/upstream-boto_s3_object
...
Upstream new boto_s3 execution/state modules
2017-12-19 10:26:26 -05:00
Nicole Thomas
aea1a584a5
Merge pull request #45054 from AAbouZaid/toml_serializer
...
Add TOML serializer.
2017-12-19 10:23:22 -05:00
Nicole Thomas
6ecb2c7d5e
Merge pull request #45076 from garethgreenaway/oxygen_fixing_failing_file_tests
...
[oxygen] fixing failing file tests
2017-12-19 09:54:55 -05:00
Gareth J. Greenaway
3270f926df
Fix for failing file comment & uncomment tests with python 3.5
2017-12-18 14:46:50 -08:00
Nicole Thomas
a4adc82ddd
Merge pull request #45064 from terminalmage/fix-sshclient
...
Fix incorrect use of six.string_types in ssh client
2017-12-18 13:13:41 -05:00
Nicole Thomas
8331d51628
Merge pull request #45041 from terminalmage/add-print_function
...
[PY3] Add print_function import to files with unicode_literals already added
2017-12-18 11:45:26 -05:00
Erik Johnson
1f43aa84fe
Fix incorrect use of six.string_types in ssh client
...
This was broken a few days ago when making PY3 incompatibility changes.
`six_text_type` needed to be used instead of `six.string_types`.
2017-12-18 08:31:38 -06:00
Nicole Thomas
0675139e2c
Merge pull request #44898 from terminalmage/revert-pr-32133
...
rest_cherrypy: revert addition of eauth user and groups to low chunks
2017-12-18 09:04:35 -05:00
Nicole Thomas
152b8aeaf2
Merge pull request #45044 from Ch3LL/fix_mac_tests
...
Fix swap_total for macosx grain detection
2017-12-18 08:56:17 -05:00
Nicole Thomas
5bd7854d27
Merge pull request #45042 from rallytime/py3-rsync-tests
...
Fix a couple of PY3 test failures in the rsync module
2017-12-16 08:18:24 -05:00
Nicole Thomas
04a2ea8cd1
Merge pull request #45019 from rallytime/merge-oxygen
...
[oxygen] Merge forward from 2017.7 to oxygen
2017-12-16 08:16:57 -05:00
Ahmed AbouZaid
696cad0d02
correct comment
2017-12-16 01:12:44 +01:00
Nicole Thomas
d933af39a6
Merge pull request #42118 from fake-name/develop
...
Patches for https://github.com/saltstack/salt/issues/42106 and https://github.com/saltstack/salt/issues/42117
2017-12-15 15:51:33 -05:00
Nicole Thomas
567c363e5c
Merge pull request #44989 from vutny/oxygen-doc-schedule-util-duplicated
...
[Oxygen] [DOC] Add doc page reference for schedule util module
2017-12-15 14:49:48 -05:00
rallytime
ecb1e3cf82
Fix a couple of PY3 test failures in the rsync module
...
Fixes:
- unit.modules.test_rsync.RsyncTestCase.test_rsync
- unit.modules.test_rsync.RsyncTestCase.test_version
2017-12-15 14:32:32 -05:00
Ch3LL
4d6abeff66
Fix swap_total for macosx grain detection
2017-12-15 14:30:13 -05:00
Nicole Thomas
561ce04bd9
Merge branch 'oxygen' into revert-pr-32133
2017-12-15 13:16:33 -05:00
Erik Johnson
8cdb9ea54f
[PY3] Add print_function import to files with unicode_literals already added
...
This makes the 2.x usage invalid syntax and forces the use of print as a
function. This adds the import to the files which I've updated in the
last couple of days but forgot to add it.
2017-12-15 12:14:18 -06:00
Nicole Thomas
73e85874d8
Merge branch 'oxygen' into upstream-boto_s3_object
2017-12-15 12:36:17 -05:00
Nicole Thomas
76a4d70449
Merge pull request #43985 from bodhi-space/caller_ref_fix
...
Quick fix for caller_ref issues in boto_route53
2017-12-15 12:35:03 -05:00
Nicole Thomas
0b88ea7eb4
Lint: Remove unused import
2017-12-15 12:31:43 -05:00
Nicole Thomas
ba0cbea689
Lint: Remove extra blank line
2017-12-15 12:31:08 -05:00
Nicole Thomas
81ded2aaba
Merge pull request #44533 from cloudflare/nested-colors
...
Nested outputter colors depending on the function retcode
2017-12-15 12:28:02 -05:00
Nicole Thomas
abf34064a1
Merge pull request #44916 from jasperla/status/openbsd/meminfo
...
status.meminfo: add OpenBSD support
2017-12-15 12:25:56 -05:00
Nicole Thomas
4e56835221
Merge pull request #45032 from terminalmage/renderers-returners-unicode
...
[PY3] Add unicode_literals to renderers and returners
2017-12-15 12:04:46 -05:00
Nicole Thomas
129115ee35
Merge pull request #45028 from terminalmage/runners-unicode
...
[PY3] Add unicode_literals to runner modules
2017-12-15 12:04:22 -05:00
Nicole Thomas
e631ce1276
Merge pull request #45030 from terminalmage/moar-unicode
...
[PY3] Add unicode_literals to tops, thorium, proxy, tokens
2017-12-15 12:04:05 -05:00
Nicole Thomas
3e33276d13
Merge pull request #45024 from terminalmage/salt.client-unicode
...
[PY3] Add unicode literals to the clients and associated files/tests
2017-12-15 11:01:16 -05:00
Erik Johnson
239fc8d774
[PY3] Add unicode literals to the clients and associated files/tests
2017-12-15 00:19:55 -06:00
Erik Johnson
c65d4714e5
[PY3] Add unicode_literals to renderers and returners
2017-12-15 00:17:26 -06:00
Erik Johnson
7147ac69ac
Add unicode_literals to tops, thorium, proxy, tokens
2017-12-14 21:56:49 -06:00
Erik Johnson
5adf852615
Add unicode_literals to runner modules
2017-12-14 19:30:14 -06:00
Connor Wolf
241024951d
Merge branch 'oxygen' into develop
2017-12-14 16:55:25 -08:00
Tom Williams
97e341643d
Merge branch 'develop' into caller_ref_fix
2017-12-14 17:50:28 -05:00
Tom Williams
db520b0ea7
Merge branch 'infra5975' into caller_ref_fix
2017-12-14 16:54:25 -05:00
Tom Williams
08e5dfcc57
INFRA-5975 - even BETTER documentation!
2017-12-14 16:51:49 -05:00
Tom Williams
255d5d22bd
INFRA-5975 - trimmed too much
2017-12-14 16:40:16 -05:00
Tom Williams
2bbe4eb162
INFRA-5975 - documentation and formatting fixes
2017-12-14 16:39:58 -05:00
Nicole Thomas
653ad2a224
Merge pull request #44946 from terminalmage/unicode-file
...
[PY3] Update file state/execution modules and associated files with unicode_literals
2017-12-14 16:26:50 -05:00
Tom Williams
a1184c8c2c
INFRA-5975 - trimmed too much
2017-12-14 13:15:27 -05:00
rallytime
3e319d50b3
Merge branch '2017.7' into 'oxygen'
...
Conflicts:
- README.rst
- salt/modules/win_pkg.py
- salt/utils/process.py
2017-12-14 13:01:29 -05:00
Nicole Thomas
3ed7a29c56
Merge pull request #44973 from gtmanfred/oxygen
...
fix proxyminion tests with py3
2017-12-14 12:53:22 -05:00
Nicole Thomas
c4f0894689
Merge pull request #44900 from xuhcc/rbenv-ret-fix
...
Fix TypeError during rbenv ruby installation when rbenv is not found
2017-12-14 12:37:13 -05:00
Tom Williams
e4b6002cac
INFRA-5975 - documentation and formatting fixes
2017-12-14 12:31:24 -05:00
Jasper Lievisse Adriaanse
5d4d1e29ff
status.meminfo: add OpenBSD support
2017-12-14 18:00:27 +01:00
