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
82,206 Commits 24 Branches 182 Tags 341 MiB
41c65b0e2c
Commit Graph

82206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Maryniuk
6cd3c37ecf Check if byte strings are properly encoded in UTF-8 
Rename keywords arguments variable to a default name.
 2017-06-16 14:37:45 +02:00
Luke Overend
92381d7b6d Update napalm_syslog engine to use auth class 
We have changed napalm-logs to have a keep alive so when the server
restarts the client automatically re-authenticates. This PR changes the
salt engine to make use of the new keep alive.

napalm-logs PR https://github.com/napalm-automation/napalm-logs/pull/87
 2017-06-16 09:48:27 +01:00
Daniel Wallace
05f2c66604 handle bytes strings in mock_open 2017-06-15 22:43:40 -06:00
Daniel Wallace
4f7c6d1161 use our own mock_open 
test.support.mock.mock_open specifies a side effect so that if you constantly
read a mocked open call, it will only iterate through it once, and then after
it will appear as if the end of the file has been reached.

This is needed for salt.modules.cp.push to be tested correctly.
 2017-06-15 17:50:35 -06:00
Seth House
bf15c0bb5f Restore sending __current_eauth_* through to the function 
I had forgotten this was originally added in #32133 specifically so that
it would be availble to the called function.
 2017-06-15 17:43:54 -06:00
Seth House
6be975da2c Fix regressions from not calling load_args_and_kwargs 
PR #39472 regressed ignoring invalid kwargs (#40845, #41733).
 2017-06-15 17:43:41 -06:00
Seth House
9d1cc1a176 Add test to check that runners ignore invalid kwargs 
I dunno if this is what we want long-term but this tests current
behavior.
 2017-06-15 17:40:38 -06:00
rallytime
c828ad803a Add a bunch of config options to the various master/minion files that are missing 
I started on these a while ago and never submitted them. I added a couple more today
and figured I should get these in.

Refs #32400
 2017-06-15 16:21:47 -06:00
Mike Place
87e2e72d94 Merge pull request #41768 from rallytime/bp-41615 
Manually back-port the changes in PR #41615
 2017-06-15 15:41:44 -05:00
Mike Place
a46f6809df Merge pull request #41758 from twangboy/docs_win_add_master_config 
Add Windows Master config information
 2017-06-15 15:29:27 -05:00
Daniel Wallace
733a2279ca npm 5.0.0 added a second line after fsevents 
Remove that line from so we only get the json
 2017-06-15 14:00:31 -06:00
Mike Place
b12611d122 Merge pull request #41617 from cro/n_proxy_tests 
Port salt-proxy tests to the testsuite changes in Nitrogen.
 2017-06-15 12:07:29 -05:00
rallytime
804e4f99ff Uncomment deprecation decorator and bump removal version to Sodium 
I also added a couple of blank lines to the code-block references.
The docs weren't rendering these sections because of the missing
blank lines.
 2017-06-15 10:35:50 -06:00
twangboy
b6201bac33 Fix version numbers 2017-06-15 09:53:57 -06:00
twangboy
c3dc38587e Fix indentation 2017-06-15 09:49:13 -06:00
Mike Place
36cb223ab2 Merge pull request #41740 from terminalmage/zd1532 
Fix spurious error when glob/regex used in publisher_acl
 2017-06-15 10:14:56 -05:00
Mike Place
d8b83af3d6 Merge pull request #41745 from terminalmage/fix-runtests-helpers 
Fix runtests_helpers.modules_available when multiple modules passed
 2017-06-15 10:14:16 -05:00
Mike Place
c58f3811ce Merge pull request #41746 from rallytime/version-added-nitrogen 
Update Nitrogen references to 2017.7.0
 2017-06-15 10:12:18 -05:00
Mike Place
126a36747b Merge pull request #41749 from terminalmage/parse_targets 
Fix bug in pkg_resource.parse_targets when version passed
 2017-06-15 10:05:52 -05:00
Mike Place
b6b3eb1aa1 Merge pull request #41767 from rallytime/exit_status_test 
Disable new part of test_exit_status_correct_usage test for now
 2017-06-15 10:02:02 -05:00
Mike Place
fbd27744e4 Merge pull request #41764 from cloudflare/fix-capirca 
Add new term field for capirca Term class
 2017-06-15 09:59:13 -05:00
rallytime
b6cc0b6bf0 Manually backport the changes in PR #41615 
The automatic back-porting process did't work for this file since the
testing file has been renamed. I manually added the changes to
`timezone_test.py` that were present in PR #41615.
 2017-06-15 08:53:25 -06:00
rallytime
33905fd520 Disable new part of test_exit_status_correct_usage test for now 
This new part of the test_exit_status_correct_usage test was added
in PR #41382. This test, along with some memory leakage for the
test running in Python 3, has exposed an underlying issue with
Minion._thread_return subprocessing in the test suite. Due to this
issue, this test is extremely flaky.

Per @DmitryKuzmenko's recomendation in https://github.com/saltstack/salt-jenkins/issues/378,
this test should be commented out for the time being. He is planning
on coming back to this issue to uncomment the test once the underlying
problem has been resolved.
 2017-06-15 08:44:34 -06:00
Mircea Ulinic
db255d3702 Add new term field for capirca Term class 2017-06-15 11:50:08 +00:00
Nicole Thomas
2c24012ded Merge pull request #41753 from rallytime/bp-41449 
Back-port #41449 to 2016.11
 2017-06-14 16:16:10 -06:00
Mike Place
e685858269 Merge pull request #41750 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-06-14 17:15:40 -05:00
Nicole Thomas
b26542efe3 Merge pull request #41751 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-06-14 16:14:54 -06:00
C. R. Oldham
2e4a0633da Extend __proxy__ to jinja as proxy (like __salt__->salt) 2017-06-14 15:25:43 -06:00
twangboy
80ac6381c2 Add Windows Master config information 2017-06-14 15:15:46 -06:00
Mike Place
36cc8f1e35 Merge pull request #41756 from Ch3LL/2016.11.6_release 
Add Change Log to 2016.11.6 Release Notes
 2017-06-14 15:57:07 -05:00
Ch3LL
fa368f21ac
Add Change Log to 2016.11.6 Release Notes 2017-06-14 16:00:50 -04:00
Sébastien Wains
fae41c2875 Adjusting SVN unit test 2017-06-14 13:40:50 -06:00
Sebastien
eac6b151eb Improved SVN output in test mode 2017-06-14 13:40:49 -06:00
rallytime
65cf36f607 Use salt.utils.versions file for LooseVersion in 2017.7 2017-06-14 13:34:34 -06:00
rallytime
16a2747d7d Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/windows/buildenv/salt.bat
  - salt/modules/pillar.py
  - salt/utils/openstack/nova.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
  - tests/unit/cloud/clouds/test_gce.py
 2017-06-14 13:31:42 -06:00
rallytime
89834e49c2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - conf/master
  - salt/utils/schedule.py
 2017-06-14 13:24:11 -06:00
garethgreenaway
edcafc6a26 Merge pull request #41692 from rallytime/fix-40155 
Add boto and boto3 version dependencies to boto_vpc state docs
 2017-06-14 12:05:06 -07:00
Erik Johnson
698806fb09 No need to manually create pkg_params dict when name and version passed 
This was an incorrect fix, the fix should have been made in
pkg_resource.parse_targets. Now that it is fixed there, this is not
needed.
 2017-06-14 14:03:26 -05:00
Mike Place
afa01f0cc9 Merge pull request #41744 from twangboy/docs_win_add_firewall 
Add instructions for Opening Windows Firewall for Salt
 2017-06-14 13:53:07 -05:00
Erik Johnson
bdaeb55a77 Merge pull request #40902 from lorengordon/pillar-get-merge-lists 
Removes duplicates when merging pillar lists and adds pillar.get override for pillar_merge_lists
 2017-06-14 13:39:08 -05:00
rallytime
2b51a20d02 Replace "nitrogen" references with 2017.7.0, too! 2017-06-14 12:20:45 -06:00
rallytime
cc07664a9f Replace Nitrogen with 2017.7.0 in remain directories 2017-06-14 12:18:37 -06:00
Erik Johnson
5c970d81e5 Fix runtests_helpers.modules_available when multiple modules passed 
tests.support.helpers passes the single-asterisk tuple of args as
individual arguments to runtest_helpers.modules_available. This breaks
tests which pass more than one argument to the requires_salt_modules
decorator.

This has been fixed by making runtests_helpers.modules_available accept
an arbitrary number of args via using a single-asterisk.
 2017-06-14 13:16:30 -05:00
rallytime
00ecda1002 Replace Nitrogen references with 2017.7.0 in modules/* 2017-06-14 12:14:27 -06:00
rallytime
67368b07da Replace Nitrogen with 2017.7.0 for the following directories: 
- netapi
- output
- pillar
- proxy
- renderers
- returners
- roser
- runners
- sdb
 2017-06-14 11:59:55 -06:00
rallytime
b0145578bf Update Nitrogen references to 2017.7.0 for states, utils, tests directory 
Also updated version.py with release tuple
 2017-06-14 11:54:27 -06:00
twangboy
795a1aab4f Add instructions for Windows Firewall 2017-06-14 11:42:00 -06:00
rallytime
c5b75d030a Update Nitrogen references to 2017.7.0 in doc/* 2017-06-14 11:36:06 -06:00
garethgreenaway
203ec6730f Merge pull request #41723 from rallytime/libcloud-support 
Support apache-libcloud work-around for issue #32743 for versions older than 2.0.0
 2017-06-14 10:13:38 -07:00
Erik Johnson
7484bcc6c6 parse_targets: include version in packed return data 2017-06-14 12:02:53 -05:00