Commit Graph

94038 Commits

Author SHA1 Message Date
Bo Maryniuk
0543578336 Deprecate 'async' parameter in Mandrill API 2018-08-10 15:59:24 +02:00
Bo Maryniuk
1107de0dec Lintfix: PEP8 requires two empty lines 2018-08-10 15:59:24 +02:00
Bo Maryniuk
2a18e335af Fix function signatures in Cassandra module 2018-08-10 15:59:24 +02:00
Bo Maryniuk
603f94e2a3 Cleanup docstrings at module level 2018-08-10 15:59:24 +02:00
Bo Maryniuk
b9718d3a09 Fix log error/info/warning and exception messages 2018-08-10 15:59:24 +02:00
Bo Maryniuk
6e77aff69a Fix local opts from CLI 2018-08-10 15:59:24 +02:00
Bo Maryniuk
493e48ddb5 Remove internal variables/properties with the reserved words 2018-08-10 15:59:23 +02:00
Bo Maryniuk
be07f64bc4 Change internal function signatures to avoid reserved word 2018-08-10 15:59:23 +02:00
Bo Maryniuk
7d095e0b26 Rename async function to asynchronous 2018-08-10 15:59:23 +02:00
Bo Maryniuk
35eaebb8a4 Fix docstrings 2018-08-10 15:59:23 +02:00
Bo Maryniuk
7a597f19b5 Fix comments 2018-08-10 15:59:23 +02:00
Bo Maryniuk
69920366ae Fix CLI config 2018-08-10 15:59:23 +02:00
Bo Maryniuk
173f3d7aa8 Fix docstring typo 2018-08-10 15:52:01 +02:00
Bo Maryniuk
b7da571624 Fix imports 2018-08-10 15:52:01 +02:00
Bo Maryniuk
7ec3954bef Rename module to full wording 2018-08-10 15:52:01 +02:00
Nicole Thomas
0d2a495378
Merge pull request #49050 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.8 to 2017.7
2018-08-10 09:43:48 -04:00
Gareth J. Greenaway
fc0817cb35
The osfullname grain differs when using Python2 vs Python3, swapping this out for the "OS" grain which is consistent. 2018-08-10 09:14:49 -04:00
rallytime
ed6fb8b739
Merge branch '2017.7.8' into '2017.7'
No conflicts.
2018-08-10 09:08:47 -04:00
Nicole Thomas
189e28691f
Merge pull request #49044 from Ch3LL/vultr_test
increase timeout on vultr cloud integration test
2018-08-09 21:28:16 -04:00
Nicole Thomas
70be9ac9b1
Merge pull request #49046 from garethgreenaway/1022_fixing_test_failing_py3_Debian_test
[2017.7] Another fix to tests/integration/modules/test_service.py
2018-08-09 21:22:56 -04:00
Gareth J. Greenaway
fa2339bb91
The osfullname grain differs when using Python2 vs Python3, swapping this out for the "OS" grain which is consistent. 2018-08-09 17:12:06 -07:00
Ch3LL
0dedfae4d1
increase timeout on vultr cloud integration test 2018-08-09 17:33:56 -04:00
Nicole Thomas
4eeb75f028
Merge pull request #49033 from terminalmage/issue48996
Fix file.get_diff for remote files
2018-08-09 17:06:52 -04:00
Nicole Thomas
c606a32cf2
Merge pull request #49042 from rallytime/flaky-jinja-test
Mark a jinja template test as flaky
2018-08-09 17:05:53 -04:00
Nicole Thomas
6415b6f73b
Merge pull request #49041 from Ch3LL/ec2_fix
[2017.7.8] backport PR #48212
2018-08-09 17:05:26 -04:00
Nicole Thomas
b24c96a292
Merge pull request #48926 from travispaul/fix-netbsd-8-new-ifconfig
Handle ifconfig output differently for NetBSD >= 8.0
2018-08-09 16:07:43 -04:00
rallytime
a43d9b4ba6
Mark a jinja template test as flaky
Fixes https://github.com/saltstack/salt-jenkins/issues/1059
2018-08-09 15:51:34 -04:00
Ch3LL
cf7f2459b8
[2017.7.8] backport PR #48212 2018-08-09 15:47:39 -04:00
Nicole Thomas
69c9b0afb1
Merge pull request #49036 from cspeidel/doc-fix-netyang
minor doc fix in netyang.py
2018-08-09 14:57:07 -04:00
Chris Speidel
f7ac085eb5
minor doc fix in netyang.py 2018-08-09 14:45:40 -04:00
Nicole Thomas
c5f3fd6b2b
Merge pull request #48997 from AVeenstra/patch-1
Python 3 related fix in highstate_return.py
2018-08-09 13:57:51 -04:00
Nicole Thomas
7d6b9ed0a5
Merge pull request #48803 from dmurphy18/aix_filesystems
Support for execution modules and states mount on AIX
2018-08-09 13:51:54 -04:00
Nicole Thomas
2a38905a8a
Merge pull request #48929 from terminalmage/issue48496
2 salt-key fixes
2018-08-09 13:50:06 -04:00
Nicole Thomas
bb9d23bfa1
Merge pull request #49022 from dwoz/47481_docs
Document time format idiosyncrasies
2018-08-09 13:47:11 -04:00
Nicole Thomas
702e76cfc9
Merge branch '2018.3' into issue_48557 2018-08-09 13:47:06 -04:00
Nicole Thomas
9b6a9ff4f1
Merge pull request #48932 from twangboy/fix_win_repo
Fix pkg.install when pkg already installed
2018-08-09 13:45:50 -04:00
Nicole Thomas
d7b7a92ef6
Merge pull request #49011 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-08-09 13:34:17 -04:00
Nicole Thomas
1db036406b
Merge pull request #49030 from rallytime/update-client-tests
Update netapi client tests
2018-08-09 13:11:14 -04:00
Erik Johnson
163aea71c8
Lint 2018-08-09 11:10:15 -05:00
Erik Johnson
d6e5038022
Fix file.get_diff for remote files
Once the files were cached, the function was still trying to open the
paths passed into it, not the cached paths. This fixes that and adds
additional unit tests.
2018-08-09 10:56:05 -05:00
Nicole Thomas
3325b7d4c0
Merge pull request #48985 from garethgreenaway/48123_file_directory_recurse_fails_broken_symlink
[2018.3] Fix to salt/modules/file.py
2018-08-09 11:03:08 -04:00
Nicole Thomas
c06a3cf531
Merge pull request #49021 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.8 to 2017.7
2018-08-09 10:32:42 -04:00
rallytime
f08ee6c6ae
Update netapi client tests
This change does 2 things:
- Skip 2 tests: they are not actually _testing_ anything, just running functions
  Let's skip these for now until we can dedicate some time to investigate what
  should be tested here. This will also help the tests breath a little bit.
- Add a small sleep to the async test. This test needs a little breathing room so
  the procs don't get stepped on. I think this is what is causing the master to
  shut down sometimes during test runs:

```
08:41:47          test_wheel_async (integration.netapi.test_client.NetapiClientTest)
08:41:47        [CPU:0.0%|MEM:13.2%]  ... 12:41:47,280 [salt.utils.process                         :670 ][ERROR   ] An un-handled exception from the multiprocessing process 'SignalHandlingMultiprocessingProcess-24' was caught:
08:41:47        Traceback (most recent call last):
08:41:47          File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run
08:41:47            return self._original_run()
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run
08:41:47            self._target(*self._args, **self._kwargs)
08:41:47          File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function
08:41:47            salt.utils.daemonize()
08:41:47          File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize
08:41:47            os.dup2(dev_null.fileno(), sys.stdout.fileno())
08:41:47        io.UnsupportedOperation: fileno
08:41:47        Process SignalHandlingMultiprocessingProcess-24:
08:41:47        Traceback (most recent call last):
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 249, in _bootstrap
08:41:47            self.run()
08:41:47          File "/tmp/kitchen/testing/salt/utils/process.py", line 663, in _run
08:41:47            return self._original_run()
08:41:47          File "/usr/lib/python3.5/multiprocessing/process.py", line 93, in run
08:41:47            self._target(*self._args, **self._kwargs)
08:41:47          File "/tmp/kitchen/testing/salt/client/mixins.py", line 457, in _proc_function
08:41:47            salt.utils.daemonize()
08:41:47          File "/tmp/kitchen/testing/salt/utils/__init__.py", line 514, in daemonize
08:41:47            os.dup2(dev_null.fileno(), sys.stdout.fileno())
08:41:47        io.UnsupportedOperation: fileno
```
2018-08-09 10:11:20 -04:00
rallytime
02670969d0
Apply fix to ssh init file that was there before merge 2018-08-09 09:53:09 -04:00
rallytime
7e1f7915e4
Revert "Allow for not being prompted to supply a password to deploy keys to a minion with salt-ssh"
This reverts commit a131c9beeb.
2018-08-09 09:50:52 -04:00
rallytime
00416d54d1
Revert "add key-deploy test"
This reverts commit 5b443af7ae.
2018-08-09 09:50:40 -04:00
Travis Paul
d59b6d8269
Add unit test for NetBSD 8 ifconfig changes
lint changes in salt/utils/network.py
2018-08-09 21:26:08 +08:00
Nicole Thomas
d353c02a8c
Merge pull request #49019 from garethgreenaway/47695_fixing_scheduler_bug_when_enabled_is_present
[2018.3] Fix to scheduler when global enabled key is present
2018-08-09 09:06:25 -04:00
Nicole Thomas
a56bc7ffb9
Merge pull request #49023 from The-Loeki/patch-1
Salt SSH appends IdentityFile=agent-forwarding
2018-08-09 08:55:58 -04:00
rallytime
ca82b3d57a
Merge branch '2017.7.8' into merge-2017.7 2018-08-09 08:44:07 -04:00