Nicole Thomas
3dc3e4e690
Merge pull request #45412 from isbm/isbm-ssdp-spurious-errors-fix
...
Isbm ssdp spurious errors fix
2018-01-18 07:07:01 -05:00
Nicole Thomas
571c33aa39
Merge pull request #45518 from gtmanfred/2016.11.9
...
fix last 2016.11.9 failing tests
2018-01-18 07:03:49 -05:00
Daniel Wallace
5455d2dee6
fix centos 6 pip test
...
flake8 is having problems installing on python2.6, switching to different
module that still works easily on python 2.6
2018-01-17 22:41:06 -07:00
Daniel Wallace
40255194b0
fix fedora pkg test
...
yum is no longer installed by default on fedora. apparently it has been
removed from the base installs, and only dnf is available. Stop depending on
the pkg manager, and just use bash.
2018-01-17 21:35:41 -07:00
Erik Johnson
7199c0b9db
(PY2 only) Ensure custom args passed to timed_subprocess are encoded
2018-01-17 20:43:48 -06:00
Erik Johnson
abd470f7b1
Handle corner case where None is passed in command args
2018-01-17 20:43:48 -06:00
Erik Johnson
ef44ca977a
[PY2] timed_subprocess: ensure custom env vars do not contain unicode
...
subprocess will use `ascii` to encode them which will cause trouble if
any actual unicode content is present.
2018-01-17 20:43:48 -06:00
Erik Johnson
e0890baa31
Use correct attribute in test_log_created
2018-01-17 19:54:47 -06:00
Erik Johnson
2ab1e71ef2
[PY3] Add unicode_literals to salt.utils modules (P)
2018-01-17 19:54:44 -06:00
twangboy
4517ca72b9
Ensure utf-8 encoding
2018-01-17 16:22:44 -07:00
twangboy
76af77f44d
Use to_unicode instead of repr
2018-01-17 16:14:21 -07:00
Erik Johnson
4ca7931655
[PY3] Update modules/states for PY3/Unicode compatibility (B)
...
This includes all the boto modules
2018-01-17 17:06:07 -06:00
Gareth J. Greenaway
f724c579d2
Merge branch 'oxygen' into oxygen_updating_utils_for_unicode_round_one
2018-01-17 12:51:38 -08:00
Gareth J. Greenaway
a68ff09084
Merge branch 'oxygen' into oxygen_updating_utils_for_unicode_round_three
2018-01-17 12:51:34 -08:00
Frode Gundersen
ccf062d62e
fix test_archive test for mac on 2017.7 branch
2018-01-17 18:54:35 +00:00
Bo Maryniuk
371f5b6518
Remove explicit unicode literal
2018-01-17 19:23:24 +01:00
Bo Maryniuk
d62ffb781e
Remove redundant argument from the function
2018-01-17 19:16:52 +01:00
Bo Maryniuk
e2c0164c3b
Remove mistakingly added code after conflict resolution
2018-01-17 19:15:29 +01:00
Nicole Thomas
7d5899469e
Merge pull request #45445 from rallytime/bp-45385
...
Back-port #45385 to oxygen
2018-01-17 12:53:05 -05:00
rallytime
4b64a3964e
Update function new name in release notes
2018-01-17 12:45:12 -05:00
rallytime
de6d85959a
Lint fix
2018-01-17 12:42:38 -05:00
Nicole Thomas
12a899cfb9
Merge pull request #45463 from rallytime/fix-unit-file-test
...
Change "to_str" to "to_bytes": needed when opening a file in bytes mode
2018-01-17 12:38:11 -05:00
Nicole Thomas
f65fed754c
Merge pull request #45447 from rallytime/bp-45393
...
Back-port #45393 to oxygen
2018-01-17 12:31:56 -05:00
Nicole Thomas
5a2a31bfff
Merge pull request #45495 from vutny/doc-rhel-pygit2-compat
...
[DOC] Suggest to upgrade pygit2 and deps
2018-01-17 12:25:41 -05:00
Nicole Thomas
7379f9e3e5
Merge pull request #45442 from rallytime/bp-45399
...
Back-port #45399 to 2017.7.3
2018-01-17 12:20:47 -05:00
Nicole Thomas
e1403b6813
Merge pull request #45444 from rallytime/bp-45343
...
Back-port #45343 to 2017.7
2018-01-17 12:17:58 -05:00
Gareth J. Greenaway
5309123fb6
Wrap the return in salt.utils.stringutils.to_bytes for PY2 so we are sure we are getting back bytes and not unicode.
2018-01-17 09:03:14 -08:00
Gareth J. Greenaway
993a576f72
The call to raise should still use format.
2018-01-17 09:03:14 -08:00
Gareth J. Greenaway
a773ff90e5
More unicode changes. Adding print_function to all files. Updating various reads & writes to files.
2018-01-17 09:03:14 -08:00
Gareth J. Greenaway
553669f94f
Fixing a typo
2018-01-17 09:03:14 -08:00
Gareth J. Greenaway
a79112cc91
Updating more utils and tests for Unicode goodness
2018-01-17 09:03:14 -08:00
Gareth J. Greenaway
9fe19d369d
Updating various utils for Unicode goodness
2018-01-17 09:03:14 -08:00
Gareth J. Greenaway
e14b655c01
More unicode changes. Adding print_function to all files. Updating various reads & writes to files.
2018-01-17 09:02:17 -08:00
Gareth J. Greenaway
db41d9b303
Updating various utils and related tests for unicode goodness.
2018-01-17 09:02:17 -08:00
Nicole Thomas
4803fef51a
Merge pull request #44648 from isbm/isbm-bsc1068446-develop
...
DoubleBugfix: a) errors in external pillar causes crash, b) highstate crashes on certain SLS scenarios
2018-01-17 10:58:34 -05:00
Nicole Thomas
9c4fb42e5f
Merge pull request #45481 from twangboy/fix_aptpkg
...
Fix if statement in __init__()
2018-01-17 10:29:45 -05:00
rallytime
d72fc74e8c
Merge branch '2016.11.9' into '2016.11'
...
No conflicts.
2018-01-17 10:18:56 -05:00
Nicole Thomas
4b2c88e2e6
Merge pull request #45465 from terminalmage/bp-45095
...
Backport #45095 to 2017.7 branch
2018-01-17 10:13:05 -05:00
Nicole Thomas
4e0a0eec1f
Merge pull request #45443 from rallytime/bp-45399-2016.11.9
...
Back-port #45399 to 2016.11.9
2018-01-17 09:53:57 -05:00
Nicole Thomas
ebd4db66b8
Merge pull request #45493 from damon-atkins/2016.11_fix_sls_defintion_wrong_type
...
win_pkg: pkg.refresh_db report an issue if a sls pkg definition does not contain a dict instead of aborting
2018-01-17 09:52:03 -05:00
Dmitry Kuzmenko
f33ebcada0
Doc note about user names regex matching in pub acl and eauth.
2018-01-17 17:49:19 +03:00
Denys Havrysh
0d79b9eaff
[DOC] Suggest to upgrade pygit2 and deps
2018-01-17 15:24:15 +02:00
Bo Maryniuk
29b67b3b18
Refactor unit tests so they call class-based decorator
2018-01-17 14:13:25 +01:00
Damon Atkins
af108440df
win_pkg lint space after ,
2018-01-17 23:30:25 +11:00
Damon Atkins
c6e922a236
win_pkg lint issues
2018-01-17 22:46:58 +11:00
Damon Atkins
f4627d7a80
fix quote i.e. change \` to \'
2018-01-17 22:28:40 +11:00
Damon Atkins
6938a4c099
pkg.refresh_db report an issue if a sls pkg definition id not a dict instead of aborting.
2018-01-17 22:15:10 +11:00
Nicole Thomas
ee5090f69b
Merge pull request #45468 from twangboy/win_reg
...
Fix some issues with reg.py
2018-01-16 17:23:46 -05:00
rallytime
9f547a31f0
Merge branch '2016.11' into '2017.7'
2018-01-16 17:19:08 -05:00
Nicole Thomas
b756760415
Merge pull request #45482 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.11.9 to 2016.11
2018-01-16 17:17:45 -05:00
