Nicole Thomas
|
c00fddd5bb
|
Merge pull request #45357 from twangboy/win_fix_test_file
Fix `unit.modules.test_file` for Windows
|
2018-01-14 08:14:24 -05:00 |
|
Nicole Thomas
|
e8e82f2f7f
|
Merge pull request #45429 from terminalmage/py3-salt.utils-r-s
[PY3] Add unicode_literals to salt.utils modules (R-S)
|
2018-01-14 08:06:51 -05:00 |
|
Nicole Thomas
|
80f6815c11
|
Merge pull request #45439 from terminalmage/py3-salt.utils-w-z
[PY3] Add unicode_literals to salt.utils modules (W-Z)
|
2018-01-14 08:02:22 -05:00 |
|
Nicole Thomas
|
78ce60e4d4
|
Merge pull request #44977 from terminalmage/remove-more-explicit-unicode-literals
Remove more unnecessary explicit unicode literals
|
2018-01-14 07:55:29 -05:00 |
|
Nicole Thomas
|
b90e7aedde
|
Merge pull request #45440 from terminalmage/py3-a
[PY3] Add unicode_literals to states/modules (A)
|
2018-01-14 07:52:02 -05:00 |
|
Nicole Thomas
|
4d03162227
|
Merge pull request #45396 from rallytime/merge-oxygen
[oxygen] Merge forward from 2017.7 to oxygen
|
2018-01-14 07:44:37 -05:00 |
|
Erik Johnson
|
ce6fccde9c
|
[PY3] Add unicode_literals to states/modules (A)
|
2018-01-14 01:31:52 -06:00 |
|
Erik Johnson
|
54f9785e6c
|
[PY3] Add unicode_literals to salt.utils modules (R-S)
|
2018-01-13 21:14:09 -06:00 |
|
Erik Johnson
|
b89efc16eb
|
Remove more unnecessary explicit unicode literals
|
2018-01-13 21:10:04 -06:00 |
|
Erik Johnson
|
a9c82c47ea
|
[PY3] Add unicode_literals to salt.utils modules (W-Z)
|
2018-01-13 20:52:16 -06:00 |
|
Nicole Thomas
|
dcac4d4ce9
|
Merge pull request #45423 from terminalmage/py3-salt.utils-a-d
[PY3] Add unicode_literals to salt.utils modules (A-D)
|
2018-01-13 20:33:28 -05:00 |
|
Gareth J. Greenaway
|
4a5e7ce3d8
|
Merge pull request #45436 from terminalmage/fix-iam-breakage
Fix breakage in salt.utils.iam
|
2018-01-13 15:42:05 -08:00 |
|
Erik Johnson
|
1044b627a1
|
[PY3] Add unicode_literals to salt.utils modules (A-D)
|
2018-01-13 16:08:56 -06:00 |
|
Erik Johnson
|
c57b5a5502
|
Fix breakage in salt.utils.iam
This fixes breakage introduced in
https://github.com/saltstack/salt/pull/45406 and adds a unit test.
|
2018-01-13 15:04:18 -06:00 |
|
Nicole Thomas
|
a6366c9ff1
|
Merge pull request #45425 from twangboy/win_fix_swarm
Fix stack trace on machines without docker
|
2018-01-13 14:43:54 -05:00 |
|
Nicole Thomas
|
bb71b10f77
|
Merge pull request #45427 from twangboy/win_fix_test_local_cache
Fix `unit.returners.test_local_cache` for Windows
|
2018-01-13 14:36:50 -05:00 |
|
twangboy
|
e137775c1f
|
Fix race condition in Windows with the creation time
|
2018-01-12 16:22:35 -07:00 |
|
twangboy
|
6dac045148
|
Use if HAS_DOCKER in __init__
|
2018-01-12 15:15:50 -07:00 |
|
Nicole Thomas
|
b7956edb18
|
Merge pull request #45415 from Ch3LL/change-rackspace
Change rackspace provider name for >=oxygen cloud tests
|
2018-01-12 17:02:18 -05:00 |
|
twangboy
|
9289193205
|
Fix stack trace on machines without docker
|
2018-01-12 14:38:58 -07:00 |
|
Nicole Thomas
|
0c58cb77ac
|
Merge pull request #45406 from garethgreenaway/oxygen_updating_utils_for_unicode_round_two
[oxygen] Oxygen updating utils and related tests for Unicode round two
|
2018-01-12 14:07:47 -05:00 |
|
Nicole Thomas
|
1755af821d
|
Merge pull request #44866 from DSRCorporation/slots3
Slots: use execution function return as a state arg value
|
2018-01-12 13:58:16 -05:00 |
|
Nicole Thomas
|
c59bb33c89
|
Merge pull request #45354 from terminalmage/issue45352
Fix warnings when default config values are set to None
|
2018-01-12 12:45:08 -05:00 |
|
rallytime
|
bbe6f54f84
|
Update old utils paths to new paths
|
2018-01-12 12:27:08 -05:00 |
|
rallytime
|
a5719b686b
|
Lint: Remove unused import
|
2018-01-12 12:17:31 -05:00 |
|
Ch3LL
|
62035a04ff
|
update provider rackspace config
|
2018-01-12 12:02:01 -05:00 |
|
Gareth J. Greenaway
|
58d0dfe917
|
Fixing lint in listdiffer.py and reverting a change in jinja.py
|
2018-01-12 08:42:39 -08:00 |
|
Gareth J. Greenaway
|
0e44911d77
|
Updating various tests for Unicode goodness
|
2018-01-12 08:42:39 -08:00 |
|
Gareth J. Greenaway
|
9ee5b417f7
|
Updating various utils for Unicode goodness
|
2018-01-12 08:42:39 -08:00 |
|
Ch3LL
|
40677cad21
|
migrate rackspace to openstack in cloud test
|
2018-01-12 11:08:28 -05:00 |
|
Nicole Thomas
|
04b8e1cafc
|
Merge pull request #45401 from gtmanfred/oxygen
fix boto import failures
|
2018-01-12 10:55:48 -05:00 |
|
Ch3LL
|
f7cf8b6e94
|
Change rackspace provider name for >=oxygen cloud tests
|
2018-01-12 10:55:31 -05:00 |
|
Nicole Thomas
|
6f8f477fa3
|
Merge pull request #45400 from terminalmage/fix-coregrains
Fix traceback in core grains on Ubuntu 14
|
2018-01-12 09:54:05 -05:00 |
|
Nicole Thomas
|
7fa3df48ac
|
Merge pull request #45404 from twangboy/win_fix_test_vagrant
Fix `unit.modules.test_vagrant` for Windows
|
2018-01-12 09:53:12 -05:00 |
|
Nicole Thomas
|
932ca0b33a
|
Merge pull request #45403 from terminalmage/windows-encode-decode-fallbacks
Fall back to utf-8 when to_str/to_unicode/to_bytes fail to encode/decode
|
2018-01-12 09:49:35 -05:00 |
|
Nicole Thomas
|
b3b8e26b34
|
Merge pull request #45410 from s0undt3ch/oxygen
Stop using the depracated `salt.utils.get_user()` function.
|
2018-01-12 09:48:03 -05:00 |
|
Pedro Algarvio
|
5cee46ec41
|
Stop using the depracated salt.utils.get_user() function.
|
2018-01-12 10:33:31 +00:00 |
|
Daniel Wallace
|
c378c356eb
|
fix moto version
Fixes saltstack/salt-jenkins#692
|
2018-01-11 17:42:59 -07:00 |
|
twangboy
|
df64c60530
|
Remove hard-coded, linux-style paths
|
2018-01-11 23:24:46 +00:00 |
|
Erik Johnson
|
6fbe368b71
|
Fall back to utf-8 on windows when to_str/to_unicode/to_bytes fail to encode/decode
|
2018-01-11 16:49:03 -06:00 |
|
Daniel Wallace
|
fdcf71a10c
|
fix test boto imports
Test boto imports are failing for some reason
|
2018-01-11 15:14:25 -07:00 |
|
Erik Johnson
|
8cb442af5f
|
Fix traceback in core grains on Ubuntu 14
It turns out that six.b() is a damn dirty liar on Python 2 and doesn't
always produce a str() type.
|
2018-01-11 15:43:40 -06:00 |
|
Nicole Thomas
|
0e6cf84f65
|
Merge pull request #45392 from gtmanfred/oxygen
Disable discovery in test suite
|
2018-01-11 16:14:19 -05:00 |
|
rallytime
|
60370f5fb6
|
Merge branch '2017.7' into 'oxygen'
Conflicts:
- salt/config/__init__.py
- salt/daemons/masterapi.py
- salt/proxy/dummy.py
- salt/states/file.py
- tests/integration/modules/test_state.py
- tests/integration/runners/test_runner_returns.py
- tests/integration/ssh/test_state.py
- tests/support/parser/__init__.py
- tests/unit/grains/test_core.py
- tests/unit/states/test_file.py
|
2018-01-11 16:00:08 -05:00 |
|
Nicole Thomas
|
2340f0b487
|
Merge pull request #45380 from twangboy/backport_45308
Backport changes from #45308
|
2018-01-11 14:45:20 -05:00 |
|
Nicole Thomas
|
f7da716d32
|
Merge pull request #45294 from gtmanfred/2017.7
include backports_abc
|
2018-01-11 13:18:15 -05:00 |
|
Nicole Thomas
|
f77a3e9cd4
|
Merge pull request #45381 from gtmanfred/module.run
fix module.run docs
|
2018-01-11 13:02:37 -05:00 |
|
Nicole Thomas
|
8efd29f4d9
|
Merge pull request #45368 from DSRCorporation/bugs/zmq_draft
Fixes to work with pyzmq with --enable-drafts
|
2018-01-11 12:53:15 -05:00 |
|
Nicole Thomas
|
22c3efda06
|
Merge pull request #45371 from rallytime/bp-45158
Back-port #45158 to 2017.7
|
2018-01-11 12:51:37 -05:00 |
|
Daniel Wallace
|
065ae4e61f
|
increase timeout for starting daemons
|
2018-01-11 10:45:47 -07:00 |
|