valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
90,622 Commits 24 Branches 182 Tags 341 MiB
18c42297f6
Commit Graph

90622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
5bb01aeb8c
Merge forward #45638 2018-01-23 16:01:35 -07:00
Erik Johnson
0a6b06d8ea
Fix unnecessary/incorrect usage of six.binary_type 2018-01-23 17:54:27 -05:00
Nicole Thomas
79ee24c0c7
Merge pull request #45611 from terminalmage/tests-log-level 
Fix unnecessary/incorrect usage of six.binary_type
 2018-01-23 17:53:19 -05:00
Nicole Thomas
634d8dbcc0
Merge pull request #45652 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.3 to 2017.7
 2018-01-23 17:45:22 -05:00
rallytime
4e907dc84b
Merge branch '2017.7.3' into '2017.7' 
No conflicts.
 2018-01-23 17:43:59 -05:00
rallytime
1583e1edbe
Merge branch '2016.11.9' into '2016.11' 
No conflicts.
 2018-01-23 17:41:35 -05:00
Nicole Thomas
10812969f0
Merge pull request #45638 from twangboy/win_fix_shell_info 
Win fix shell info
 2018-01-23 17:38:21 -05:00
Nicole Thomas
298aa6effb
Merge pull request #45414 from ogd-software/acme_challenge_type 
Acme challenge type
 2018-01-23 17:36:45 -05:00
Nicole Thomas
9c4c22989f
Merge pull request #45607 from onovy/typos 
Fixed few typos in docs
 2018-01-23 17:34:12 -05:00
ddoh94
e474d0416b
update winrepo_source_dir document 
The winrepo_source_dir minion config can be set with or without a master.  It is currently documented as only available if the minion is running in masterless mode.  I have updated the documentation to reflect that it will work in master or masterless mode.
 2018-01-23 17:25:25 -05:00
Lee Webb
d54604a35e
Merge branch 'develop' into v2017.7.2-route53-apex 2018-01-24 09:17:11 +11:00
Nicole Thomas
fc18995873
Merge pull request #45438 from terminalmage/py3-salt.utils-t-v 
[PY3] Add unicode_literals to salt.utils modules (T-V)
 2018-01-23 17:14:16 -05:00
Lee Webb
d6504a4a8a Merge remote-tracking branch 'origin/develop' into v2017.7.2-route53-apex 2018-01-24 09:12:28 +11:00
Nicole Thomas
4423989ac8
Merge pull request #45587 from DSRCorporation/bugs/unicode_2 
Salt Unicode Update 3rd tier 2nd bunch from DK
 2018-01-23 17:08:59 -05:00
rallytime
fb4f2dd0fa
Distinguish between Authorization and Authentication errors 
And handle the error distiction being returned from the publish function
instead of sending empty strings.
 2018-01-23 17:05:22 -05:00
Nicole Thomas
4a116beba6
Merge pull request #45639 from rallytime/merge-oxygen 
[oxygen] Merge forward from 2017.7 to oxygen
 2018-01-23 17:03:26 -05:00
Nicole Thomas
0a07e0d259
Merge pull request #45642 from rallytime/bp-45636 
Back-port #45636 to 2017.7.3
 2018-01-23 17:00:29 -05:00
Nicole Thomas
dbdef8230e
Merge pull request #45630 from bdrung/2017.7 
Fix tests
 2018-01-23 16:56:46 -05:00
Nicole Thomas
e5c9cd91e8
Merge pull request #45619 from garethgreenaway/2017_7_test_mac_user_enable_auto_login 
[2017.7] Fixing test_mac_user_enable_auto_login
 2018-01-23 16:56:03 -05:00
Nicole Thomas
8a95fc4257
Merge pull request #45644 from twangboy/win_fix_dep_warns 
Add missing space to deprecation warning
 2018-01-23 16:55:10 -05:00
Nicole Thomas
f37a5b6d8d
Merge pull request #45645 from rallytime/bp-45606 
Back-port #45606 to 2017.7.3
 2018-01-23 16:54:45 -05:00
Ch3LL
1c78fc23ea
Add different service name for Mac 10.13 test 2018-01-23 16:53:06 -05:00
Nicole Thomas
c290b6320b
Merge pull request #45634 from Ch3LL/mac-service 
Add different service name for Mac 10.13 test
 2018-01-23 16:51:56 -05:00
Nicole Thomas
e659793c09
Merge pull request #45641 from rallytime/bp-45508 
Back-port #45508 to 2017.7.3
 2018-01-23 16:18:38 -05:00
rallytime
54e154b62f
Fix test errors created with unicode changes 
- jboss_cli test: reduce test complication by not mixing raw and \u
- remove one test from test_junos: it's not really testing anything since it's heavily mocked
 2018-01-23 15:48:42 -05:00
twangboy
de43636e10
Use salt.ext.six instead of six 2018-01-23 13:29:53 -07:00
rallytime
637ec36739
Fix state unit tests for kernelpkg 2018-01-23 15:26:26 -05:00
rallytime
ab99c7fbd7
Fixup small things from PR review comments 2018-01-23 15:26:26 -05:00
rallytime
ca946886f0
Lint fix 2018-01-23 15:26:26 -05:00
rallytime
c08c67f3d4
Add unicode_literals to modules, states, and related tests 2018-01-23 15:26:25 -05:00
twangboy
b9dc4b0610
Use six.text_type instead of str 2018-01-23 13:21:05 -07:00
Erik Johnson
d52d96f30a
Fix bug affecting salt-ssh when root_dir differs from the default 
H/T https://github.com/saltstack/salt/issues/44957#issuecomment-356122811
 2018-01-23 15:04:50 -05:00
Nicole Thomas
c28151f5f7
Merge pull request #45606 from terminalmage/salt-ssh-root-dir-fix 
Fix bug affecting salt-ssh when root_dir differs from the default
 2018-01-23 15:03:48 -05:00
twangboy
de9bc384cc
Add missing space to deprecation warning 2018-01-23 13:01:50 -07:00
Gareth J. Greenaway
0d2eb72547
Requested changes. 2018-01-23 11:53:17 -08:00
Gareth J. Greenaway
b1b164a227
Couple lint fixes 2018-01-23 11:53:16 -08:00
Gareth J. Greenaway
49d0d1f1a5
Updating various modules, states and related tests for Unicode fun & profit part one. 2018-01-23 11:53:16 -08:00
Nicole Thomas
4284e46720
Merge pull request #45318 from dwoz/issue-44449 
Fix cloud roster results in py3 #44449
 2018-01-23 14:44:04 -05:00
Joseph Hall
c71ccaaff8
Merge branch 'develop' into msgpackgate 2018-01-23 12:41:40 -07:00
Frode Gundersen
e6917a291e
fix test_archive test for mac on 2017.7 branch 2018-01-23 14:35:32 -05:00
Nicole Thomas
0931b6417d
Merge pull request #45636 from Ch3LL/mac-tests 
Fix mac service and pkg tests for 10.13
 2018-01-23 13:44:55 -05:00
Nicole Thomas
80c9787417
Merge pull request #45574 from rallytime/unicode-changes-2 
Add unicode_literals to more modules, states, and tests
 2018-01-23 13:37:46 -05:00
rallytime
583a89ca6f
Update old utils paths to new paths 2018-01-23 13:34:24 -05:00
rallytime
3c298afa72
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/modules/pip.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/runners/manage.py
  - salt/states/pkg.py
  - salt/transport/zeromq.py
  - salt/utils/event.py
  - tests/integration/modules/test_pip.py
  - tests/integration/states/test_user.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_archive.py
  - tests/unit/utils/test_boto.py
 2018-01-23 13:26:43 -05:00
twangboy
872da3ffba
Only convert text types in the list_values function 2018-01-23 10:57:36 -07:00
twangboy
0e41535cdb
Fix reg.py to only convert text types to unicode 2018-01-23 10:51:45 -07:00
twangboy
3579534ea5
Fix issue with detecting powershell 2018-01-23 10:38:28 -07:00
Ch3LL
df0ad54c9a
remove unnecessary variable for test 2018-01-23 11:47:32 -05:00
Ch3LL
acb14fd43d
fix pylint 2018-01-23 11:42:49 -05:00
Ch3LL
a9b12cd1ea
Fix mac service and pkg tests for 10.13 2018-01-23 11:39:06 -05:00