Commit Graph

61759 Commits

Author SHA1 Message Date
Benjamin Drung
301e78b5be Fix typo vaules -> values 2016-04-04 14:28:35 +02:00
Benjamin Drung
8cada9573f Fix typos of retrieve 2016-04-04 14:27:41 +02:00
Benjamin Drung
b484d6f9c9 Fix typo directorys -> directories 2016-04-04 14:20:39 +02:00
Benjamin Drung
ffe585f078 Re-add shebang to ssh-id-wrapper shell script
Commit 0b286f1bc3 removed the shebang line
from the shell script ssh-id-wrapper without reasoning. This script is
executable and needs a shebang for calling it directly. Thus re-add it.
2016-04-04 13:11:03 +02:00
Michael Calmer
cb1f30ee10 fix sorting by latest version when called with an attribute 2016-04-04 10:34:13 +02:00
Alexander Schwartz
a867d23383 ensure streaming mode (use for example by file.managed) will works for requests backend 2016-04-02 20:32:33 +00:00
Denys Havrysh
b9698f015d Update Salt Bootstrap tutorial 2016-04-02 17:06:44 +03:00
Erik Johnson
fbdc47cc55 Merge pull request #32284 from rallytime/config-audit
Audit config.py default types and values
2016-04-01 21:00:38 -05:00
rallytime
0491513204 Don't be so explicit. Just use string_types. 2016-04-01 17:12:39 -06:00
Nicole Thomas
0a6d44e57b Merge pull request #32302 from terminalmage/fix-missing-release
Properly support packages with blank "Release" param in pkg.latest_version
2016-04-01 16:13:27 -06:00
rallytime
083c477fd3 Use six.string_types in config default tuples 2016-04-01 16:09:57 -06:00
Nicole Thomas
664043d7e7 Merge pull request #32300 from twangboy/fix_28767
Add documentation to disable winrepo/winrepo_ng
2016-04-01 15:23:09 -06:00
rallytime
4037476f40 Patch call to os.path.isdir so we know both search paths are in tuple 2016-04-01 15:13:57 -06:00
Erik Johnson
413c371ccd Properly support packages with blank "Release" param in pkg.latest_version 2016-04-01 15:49:20 -05:00
twangboy
c971a3b054 Add documentation for disabled the winrepos 2016-04-01 14:18:31 -06:00
Nicole Thomas
42a25f6b9d Merge pull request #32288 from terminalmage/issue18429
use dictupdate.merge instead of dict.update to merge CLI pillar overrides
2016-04-01 10:30:30 -06:00
rallytime
49a4eec051 Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config
Refs #32183
2016-04-01 09:40:58 -06:00
twangboy
53f6a28297 Fix problem with return on installed packages 2016-03-31 17:06:21 -06:00
twangboy
f5bd004ab0 Fix chocolatey.version function 2016-03-31 16:58:23 -06:00
rallytime
66acc00c71 New salt-cloud instances should not use old hash_type default.
Updates hash_type default to sha256 instead of md5 for new
instances installed via salt-cloud.

Fixes #32246

Refs #31162
2016-03-31 16:57:16 -06:00
Erik Johnson
db31732137 use dictupdate.merge instead of dict.update to merge CLI pillar overrides
Fixes #18429.
2016-03-31 17:31:32 -05:00
rallytime
7e642b8381 Audit config.py default types and values - first sweep
- Updated standard types in VALID_OPTS dict where necessary
- Updated default values to match VALID_OPTS in DEFAULT_*_OPTS dicts
- Updated master/minion configuration reference docs to match changes
- Removed enumerate_proxy_minions value as it's not referenced anywhere in code
2016-03-31 13:50:51 -06:00
Erik Johnson
3e374e7ec6 Merge pull request #32243 from isbm/isbm-zypper-list-installed-ensure-latest
Ensure latest pkg.info_installed ensure latest
2016-03-31 11:09:59 -05:00
Bo Maryniuk
fba3d509ac Fix the documentation 2016-03-31 17:48:59 +02:00
Mike Place
88fa3c5f71 Merge pull request #32268 from ticosax/handle-dockerpy-old
[dockerng] Improve detection for older versions of docker-py
2016-03-31 08:51:46 -06:00
Mike Place
a491897a3b Merge pull request #32258 from jacobhammons/alive-interval-docs
Replaces incorrect reference to `master_alive_check`
2016-03-31 08:41:09 -06:00
Mike Place
8c68d8ac41 Merge pull request #32254 from twangboy/fix_31334
Fix Display Name with spaces in win_servermanager
2016-03-31 08:38:21 -06:00
Nicolas Delaby
05116aaa40 Improve detection for older versions of docker-py
Docker module without a `docker.version_info` property
2016-03-31 13:59:55 +02:00
Jacob Hammons
ff8ca5ac2e Replaces incorrect reference to master_alive_check with master_alive_interval in docs 2016-03-30 20:32:43 -06:00
Bo Maryniuk
73ad8a2bfc Fix lint 2016-03-31 01:55:38 +02:00
twangboy
e5f02c52be Fix a pylint error 2016-03-30 17:39:20 -06:00
twangboy
5ca4ad6675 Fix unit tests for state 2016-03-30 17:12:12 -06:00
twangboy
12d530f8f0 Fix win_servermanager state 2016-03-30 17:03:16 -06:00
twangboy
b26cb76abb Fix unit tests 2016-03-30 16:51:58 -06:00
twangboy
1d5bcee390 Fix 31344
funcitons now use OutputTo-Json
Fixes problem with returning values with spaces
list_installed only needs to call Get-WindowsFeature once
2016-03-30 16:00:00 -06:00
Nicole Thomas
0f5e67de5d Merge pull request #32248 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-03-30 15:10:01 -06:00
Nicole Thomas
6216c37885 Merge pull request #32230 from terminalmage/issue32169
systemd.py: Support both update-rc.d and chkconfig as managers of sysv services
2016-03-30 15:09:43 -06:00
jacobhammons
bde2a1fc98 Merge pull request #32249 from jacobhammons/dot8
Fixes windows download paths to account for patch
2016-03-30 14:26:53 -06:00
Jacob Hammons
50d1df2482 Fixes windows download paths to account for patch 2016-03-30 14:26:03 -06:00
rallytime
d743f8cc4e Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/modules/aptpkg.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 13:38:38 -06:00
Erik Johnson
45af3e902a systemd.py: Support both update-rc.d and chkconfig as managers of sysv services
Fixes #32169
2016-03-30 14:28:53 -05:00
Mike Place
5d08db7c92 Merge pull request #32162 from terminalmage/issue31963
Properly handle yum/zypper repositories in pkgrepo.managed
2016-03-30 11:51:05 -06:00
Erik Johnson
5c1bdb812c Fix pkgrepo integration test
Also re-enabled test on ubuntu 15.10.
2016-03-30 11:34:55 -05:00
Bo Maryniuk
f07c7ea792 Add lowpkg tests for version comparison 2016-03-30 17:33:24 +02:00
Bo Maryniuk
afdf451d87 Remove tests from the zypper_test that belongs to rpm_test 2016-03-30 17:33:03 +02:00
Bo Maryniuk
3706a21c29 Fix condition from returning None on 0 2016-03-30 17:32:31 +02:00
Bo Maryniuk
0a68ebff16 Remove suse/redhat checks, refactor code. 2016-03-30 17:06:50 +02:00
Mike Place
1d9321d043 Merge pull request #32221 from dmurphy18/fix_version_check
Fix version check, fix extracting Major and Minor versions from __ver…
2016-03-30 08:50:31 -06:00
Bo Maryniuk
30c8f7216b Move "string to EVR" function to the utilities 2016-03-30 16:46:31 +02:00
Bo Maryniuk
fb014a40b0 Sort installed pkgs data by version_cmp 2016-03-30 16:45:55 +02:00