Nicole Thomas
1f6e6a6abb
Whitespace fix
2017-08-14 10:21:32 -04:00
Nicole Thomas
c6ca7d639f
Merge pull request #42889 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2017-08-14 10:16:19 -04:00
Nicole Thomas
4b6fe2ee59
Merge pull request #42898 from mirceaulinic/patch-11
...
Minor eos doc correction
2017-08-14 09:42:20 -04:00
Bo Maryniuk
aa9d84ebba
Lintfix W8470: possible resource leakage.
2017-08-14 15:04:11 +02:00
Bo Maryniuk
77cd3138c8
Move 'which' to the new path
2017-08-14 15:04:11 +02:00
Bo Maryniuk
1b8ea9e9d9
Add known hosts lister
2017-08-14 15:04:11 +02:00
Bo Maryniuk
716f84fd34
Add list hosts option
2017-08-14 15:04:11 +02:00
Bo Maryniuk
015f273c3b
Do not expand target if list of hosts/IDs are passed
2017-08-14 15:04:11 +02:00
Bo Maryniuk
51cd42cc1b
Refactor target expander
2017-08-14 15:04:11 +02:00
Bo Maryniuk
d96c771a88
Fix PEP8: length of the string
2017-08-14 15:04:11 +02:00
Bo Maryniuk
a3907c8511
Refactor roster update process
2017-08-14 15:04:11 +02:00
Bo Maryniuk
b93d034789
Bugfix: use set to self options, instead of their copies from parameters
2017-08-14 15:04:11 +02:00
Bo Maryniuk
b306bca07a
Expand target if it is known or not FQDN
2017-08-14 15:04:11 +02:00
Bo Maryniuk
f839d5ce2d
Prevent confusion if roster and target are the same
2017-08-14 15:03:27 +02:00
Bo Maryniuk
c7d0fddd28
Add network utility to recognize if any entity is a reachable/resolvable host
2017-08-14 15:03:27 +02:00
Bo Maryniuk
ed8a3bb92f
Add option to skip roster, in case auto-add is not needed
2017-08-14 15:03:27 +02:00
Bo Maryniuk
010d4f2c9b
Add to the flat nearby writable roster the current called data
2017-08-14 15:03:27 +02:00
Bo Maryniuk
7a7c0c69e1
Update targets if they are specified in the command-line directly
2017-08-14 15:03:27 +02:00
Bo Maryniuk
400be17e8f
Remove unused imports
2017-08-14 15:03:27 +02:00
Vladislav
fee520b6f1
Merge branch 'develop' into develop
2017-08-14 08:18:14 -04:00
Adam Bolte
7848189ad4
Implement rbenv state module test mode checks
...
Fixes #42815 and updates unit tests.
2017-08-14 19:13:42 +10:00
Jeremy McMillan
813fb149c2
Add support for zfs-fuse to zfs.__virtual__()
...
##What does this PR do?
Some OS distributions which lack OS kernel support for ZFS can support the zfs module if the zfs-fuse daemon is running.
This change checks to see if the service is available, and whether it is running or starts up, and returns appropriately.
With this change, zfs support is extended to all OS platforms with zfs-fuse support in addition to those with kernel support.
##Tests written?
No
2017-08-13 13:01:17 -05:00
Mircea Ulinic
93be79a135
Index eos under the installation instructions list
2017-08-12 23:15:11 +01:00
Mircea Ulinic
f903e7bc39
Minor eos doc correction
2017-08-12 23:11:25 +01:00
spenceation
2b516313f2
Merge branch 'develop' into panos/develop
2017-08-12 16:48:32 -04:00
spenceation
e351974dd9
Updated with requested changes.
2017-08-11 21:24:17 -04:00
rallytime
fb7117f2ac
Use salt.utils.versions.LooseVersion instead of distutils
2017-08-11 16:31:24 -04:00
Erik Johnson
1764878754
Merge pull request #42883 from rallytime/fix-boto-tests
...
Fix failing boto tests
2017-08-11 15:29:11 -05:00
Nicole Thomas
af72988af6
Merge pull request #42850 from akelge/develop
...
Removed '--quiet' to avoid continuous renewal
2017-08-11 15:37:09 -04:00
Nicole Thomas
02c4ae644b
Merge pull request #42852 from thatch45/ssh_id
...
Add a key in opts that identify that we are running salt-ssh
2017-08-11 15:36:10 -04:00
Vlad Paciu
33ac9c2514
Merge branch 'develop' of github.com:vladislavPV/salt into develop
2017-08-11 15:31:49 -04:00
Vlad Paciu
1765d9adde
fix idents
2017-08-11 15:31:38 -04:00
Nicole Thomas
a3635926f3
Merge pull request #42879 from rallytime/oxygen-formatting
...
Update header markup for subsections
2017-08-11 15:24:30 -04:00
rallytime
29ff19c587
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/config/__init__.py
- salt/states/dockerng.py
- salt/utils/cloud.py
2017-08-11 15:17:19 -04:00
Nicole Thomas
b21778efac
Merge pull request #42885 from terminalmage/fix-f26-tests
...
Move weird tearDown test to an actual tearDown
2017-08-11 15:14:41 -04:00
Nicole Thomas
c15d0034fe
Merge pull request #41977 from redmatter/fix-dockerng-network-ignores-test
...
Fix dockerng.network_* ignoring of tests=True
2017-08-11 14:37:19 -04:00
Nicole Thomas
3b9c3c5671
Merge pull request #42886 from sarcasticadmin/adding_docs_salt_outputs
...
Adding missing output flags to salt cli docs
2017-08-11 14:35:18 -04:00
garethgreenaway
9868ab6f3b
Merge pull request #42887 from rallytime/fix-42870
...
Remove extraneous "deprecated" notation
2017-08-11 11:34:24 -07:00
rallytime
71e7581a2d
Remove extraneous "deprecated" notation
...
This deprecated notation was supposed to be on the "useradd_all"
function, but somehow was moved to the "useradd" function.
Fixes #42870
2017-08-11 14:31:17 -04:00
rallytime
6a7bf99848
Lint fix: add missing space
2017-08-11 14:19:15 -04:00
Nicole Thomas
64da744949
Merge pull request #42507 from steverweber/nacl_with_sealedbox
...
add support for nacl SealedBox and other extras
2017-08-11 14:12:58 -04:00
Nicole Thomas
e5b98c8a88
Merge pull request #42882 from gtmanfred/2016.11
...
make sure cmd is not run when npm isn't installed
2017-08-11 13:53:14 -04:00
Nicole Thomas
da71f2a11b
Merge pull request #42881 from gtmanfred/vmware
...
fix vmware for python 3.4.2 in salt.utils.vmware
2017-08-11 13:52:29 -04:00
Erik Johnson
462d653082
Move weird tearDown test to an actual tearDown
...
Also catch KeyError when user doesn't exist
2017-08-11 12:20:50 -05:00
Daniel Wallace
da3402a53d
make sure cmd is not run when npm isn't installed
...
apparently the skipIf on the functions still get run, even if the function is
going to be skipped based on a skipIf on the class.
2017-08-11 10:58:00 -06:00
rallytime
43643227c6
Skip 2 failing tests in Python 3 due to upstream bugs
2017-08-11 12:57:39 -04:00
Daniel Wallace
05ecc6ac8d
fix vmware for python 3.4.2 in salt.utils.vmware
2017-08-11 10:14:38 -06:00
Nicole Thomas
f43c141753
Merge branch 'develop' into datadog-events_api
2017-08-11 12:02:23 -04:00
Nicole Thomas
5962c9588b
Merge pull request #42788 from amendlik/saltify-timeout
...
Remove waits and retries from Saltify deployment
2017-08-11 11:38:05 -04:00
Nicole Thomas
227ecddd13
Merge pull request #42877 from terminalmage/add-cron-state-virtual
...
Add virtual func for cron state module
2017-08-11 11:33:09 -04:00
