Gareth J. Greenaway
8c5d515ccd
Merge branch 'oxygen' into scheduler_fixes_loop_interval
2017-12-18 15:24:16 -08:00
Gareth J. Greenaway
3270f926df
Fix for failing file comment & uncomment tests with python 3.5
2017-12-18 14:46:50 -08:00
Jan Harasym
aa438e1605
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-18 13:56:58 -05:00
Tom Williams
0ca0f37805
44303 - resolves #44303
2017-12-18 13:54:17 -05: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
Gareth J. Greenaway
047e76cb31
Merge branch 'oxygen' into scheduler_fixes_loop_interval
2017-12-18 08:10:39 -08:00
Nicole Thomas
d9a4b9681e
Merge pull request #44938 from The-Loeki/libcloud_dns_fixes
...
Libcloud dns fixes
2017-12-18 10:47:18 -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
Ronald van Zantvoort
276e8828ae
libcloud_dns: pylint fix
2017-12-18 14:32:04 +01:00
Ronald van Zantvoort
c994423286
Merge branch '2017.7' into libcloud_dns_fixes
2017-12-18 12:49:33 +01:00
Ronald van Zantvoort
c72db283d5
libcloud_dns: Further fixes to state output, pylint fixes
2017-12-18 12:40:55 +01:00
rcallphin
04ab6a5e9d
Merge branch '2017.7' into fix-bug-vault-empty-policy
2017-12-16 09:57:37 -07: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
Nicole Thomas
5137be01ec
Merge pull request #44951 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-12-16 08:16:23 -05:00
Ahmed AbouZaid
696cad0d02
correct comment
2017-12-16 01:12:44 +01:00
lomeroe
07d04c7bc7
lint fixes for static regexes
2017-12-15 15:04:51 -06:00
lomeroe
d17c46ce41
lint fixes
...
encode some of the more used characters in variables and re-use instead
of re-encoding them over and over
remove a line that was commented out
2017-12-15 15:04:51 -06:00
lomeroe
ab8e431729
do not decode registry.pol file wholesale, but instead decode individual
...
elements of the file
also fix issue where the get_policy_info function would not find
policies in the policy_data class by their "short" name (i.e. the key
name in the dict)
2017-12-15 15:04:51 -06: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
4d6d640381
Merge pull request #44969 from rallytime/bp-41305
...
Back-port #41305 to 2016.11
2017-12-15 12:22:17 -05:00
Nicole Thomas
698b04779e
Merge pull request #44995 from twangboy/win_fix_atomicfile
...
Fix `unit.modules.test_file` for Windows
2017-12-15 12:05:48 -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
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
Nicole Thomas
10de468f13
Merge pull request #45031 from terminalmage/fix-mysql-returner
...
Fix invalid exception class in mysql returner
2017-12-15 10:00:14 -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
f3bd12c27c
Fix invalid exception class in mysql returner
...
salt.exceptions.Salt does not exist
2017-12-14 23:13:56 -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
