valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
89,645 Commits 24 Branches 182 Tags 341 MiB
e8e82f2f7f
Commit Graph

7239 Commits

Author SHA1 Message Date
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
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
twangboy
e137775c1f
Fix race condition in Windows with the creation time 2018-01-12 16:22:35 -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
Gareth J. Greenaway
0e44911d77
Updating various tests for Unicode goodness 2018-01-12 08:42:39 -08:00
Nicole Thomas
04b8e1cafc
Merge pull request #45401 from gtmanfred/oxygen 
fix boto import failures
 2018-01-12 10:55:48 -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
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
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
Erik Johnson
5473c085d9
Fix loader error in 2017.7 tests 2018-01-11 08:40:27 -06:00
Nicole Thomas
223470519d
Merge pull request #44830 from terminalmage/issue40776 
Implement variable fileserver update intervals
 2018-01-11 09:10:36 -05:00
Dmitry Kuzmenko
f40cb3f2f1
Slots: bugfixes and tests. 2018-01-11 14:05:58 +03:00
Nicole Thomas
a37f7d7cd4
Merge pull request #45377 from terminalmage/py3-log-grains 
[PY3] add unicode_literals to log/grains modules
 2018-01-10 15:14:23 -05:00
Erik Johnson
f900715e1c
[PY3] add unicode_literals to log/grains modules 2018-01-10 11:37:59 -06:00
Nicole Thomas
54dc7b76e5
Merge pull request #45340 from twangboy/win_fix_test_beacons 
Fix `unit.modules.test_beacons` for Windows
 2018-01-10 12:10:52 -05:00
Erik Johnson
de7eea42fb
Add test for modified virtualnames in salt.config 2018-01-09 19:11:17 -06:00
Erik Johnson
2d6760ee40
Add update_interval to gitfs, "fs" to several virtual names 
This also adds "fs" to all of the fileserver virtualnames which did not
already have them. This both A) normalizes the usage of the non-roots
backends, and B) makes it easier for the FileserverUpdate process to get
the default update interval for each backend from the opts.
 2018-01-09 19:11:17 -06:00
Nicole Thomas
12c0f99e8c
Merge pull request #45293 from terminalmage/py3-acl-auth-netapi 
[PY3] Add unicode_literals to acl, auth, and netapi modules
 2018-01-09 16:32:59 -05:00
Nicole Thomas
56de7bcf5d
Merge pull request #45305 from terminalmage/py3-daemons 
[PY3] Add unicode_literals to daemons modules
 2018-01-09 16:30:36 -05:00
Nicole Thomas
4919b9f27d
Merge pull request #45335 from twangboy/win_fix_test_load_beacon 
Skip test_load_match on Windows
 2018-01-09 15:54:11 -05:00
Nicole Thomas
e402807cc0
Merge pull request #45332 from frogunder/fix_mac_archive_tests 
fix test_archive tests for mac
 2018-01-09 15:49:12 -05:00
Nicole Thomas
bf38bdca6c
Merge pull request #45280 from rallytime/merge-oxygen 
[oxygen] Merge forward from 2017.7 to oxygen
 2018-01-09 15:37:52 -05:00
Nicole Thomas
227cdbda70
Merge pull request #45337 from twangboy/win_fix_test_core 
Fix `unit.grains.test_core` for Windows
 2018-01-09 10:03:11 -05:00
twangboy
fe2d4ae65b
Fix paths on Windows 2018-01-08 17:20:02 -07:00
twangboy
48f12a3bbc
Skip linux specific tests 2018-01-08 15:38:26 -07:00
twangboy
df0958e699
Fix decorator, fix asserts for Windows 2018-01-08 14:53:18 -07:00
twangboy
b49b52e113
Skip test_load_match on Windows 2018-01-08 14:31:46 -07:00
Nicole Thomas
981776b9ac
Merge pull request #45322 from Ch3LL/isci_test_mac 
Skip iscsi grains test if MacOSX
 2018-01-08 16:28:13 -05:00
Nicole Thomas
d0e5e70277
Merge pull request #45295 from gtmanfred/test_directory 
test directory that doesn't exist
 2018-01-08 15:59:52 -05:00
Frode Gundersen
9edca8a6cf
fix test_archive tests for mac 2018-01-08 20:18:52 +00:00
Nicole Thomas
eea7158e82
Merge pull request #45279 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2018-01-08 12:26:48 -05:00
Nicole Thomas
154c9255f5
Merge pull request #45316 from terminalmage/py3-engines 
[PY3] Add unicode_literals to engines
 2018-01-08 12:08:57 -05:00
Ch3LL
0919d8787b
Skip iscsi grains test if MacOSX 2018-01-08 10:54:45 -05:00
Erik Johnson
7c9d95a725
[PY3] Add unicode_literals to config, executors 2018-01-07 14:48:45 -06:00
Erik Johnson
0d975c335d
Add unicode_literals to engines 2018-01-07 14:01:48 -06:00
Nicole Thomas
e6178fe6d4
Merge branch '2017.7' into test_directory 2018-01-05 17:08:58 -05:00