Piotr Kruk
94cf254f3c
hide function and add missing docstring
2017-12-16 00:24:45 +01:00
Piotr Kruk
a87e1d39f9
Refactore duplication of code and beautify style
2017-12-15 22:19:35 +01:00
Piotr Kruk
ade627f95a
Extend parted with ext3 and ext4 partition type
2017-12-15 21:59:58 +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
015d66be4d
Merge pull request #44990 from jasperla/openbsd/status/w
...
status.w: rework to support Darwin/BSD
2017-12-15 14:50:24 -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
Jan Harasym
c52a89d39a
Installation Fails on headless machines.
...
Installation fails on headless machines if `/passive` is set, `/passive` will display an installation progress bar on windows desktop. `/quiet` suppresses the GUI and does not fail when there is no desktop session available. Fixes #45036 .
2017-12-15 18:42:35 +01: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
f0c2c5037c
Merge pull request #44963 from wasabi222/patch-5
...
typo
2017-12-15 11:55:58 -05:00
Gareth J. Greenaway
63a22349d5
Random LOOP_INTERVALS should end at 59 seconds.
2017-12-15 08:53:17 -08:00
Gareth J. Greenaway
e55bc75cbe
Ensure the default loop_interval of 1 second is used until we override it in the individual tests.
2017-12-15 08:53:17 -08:00
Gareth J. Greenaway
da91283886
Updates to the schedule to handle cases where the loop_interval is not 1 second
2017-12-15 08:53:17 -08: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
35ce9d42ed
Reduce the number of days an issue is stale by 10
2017-12-14 13:06:29 -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
Jasper Lievisse Adriaanse
652964a4c2
status.w: rework to support Darwin/BSD
...
This adds support for Darwin/FreeBSD/OpenBSD where the output
does not contain several fields that Linux emits.
While here add the `from` field on BSD which is reliably populated
in the BSD implementation. Local logins are tracked as `-` or
the X Windows display.
For Linux skip `from` completely as it may be empty on local logins.
2017-12-14 17:44:14 +01:00
Nicole Thomas
0fdf346e99
Merge pull request #44976 from bodhi-space/44303
...
Fix bad variable name in boto3_route53 module - resolves #44303
2017-12-14 11:07:28 -05:00
Nicole Thomas
ae8dd2e202
Merge pull request #44982 from terminalmage/docker-unicode
...
[PY3] Add unicode_literals to docker state/execution modules
2017-12-14 11:03:15 -05:00
Nicole Thomas
4dda5f9977
Merge pull request #44985 from terminalmage/salt-ext-unicode
...
[PY3] Add unicode_literals to files in root salt/ dir (and associated tests)
2017-12-14 10:48:52 -05:00
Nicole Thomas
aef2521853
Merge pull request #44986 from terminalmage/salt.output-unicode
...
[PY3] Add unicode_literals to outputters
2017-12-14 10:47:04 -05:00
Denys Havrysh
da5e580f8c
[DOC] Add doc page reference for schedule util module
2017-12-14 16:53:07 +02:00
Erik Johnson
f73110ff83
Unskip this test
...
It has been edited to work properly and should be fine in PY3 now.
2017-12-14 08:40:58 -06:00
