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
61,437 Commits 24 Branches 182 Tags 341 MiB
66acc00c71
Commit Graph

61437 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Bo Maryniuk
b57e439d57 Merge yumpkg's and zypper's version_cmp for a common use 2016-03-30 16:44:59 +02:00
Bo Maryniuk
ebd13a283c Remove version_cmp from Zypper module and use just lowpkg alias 2016-03-30 16:44:21 +02:00
Bo Maryniuk
b46d5b526a Remove version_cmp from the yumpkg and use just a lowpkg alias 2016-03-30 16:43:47 +02:00
Mike Place
4fcdaab428 Merge pull request #32223 from twangboy/fix_31976 
Create minion.d directory on install for Windows
 2016-03-30 08:43:27 -06:00
Mike Place
22bd1e6b29 Merge pull request #32227 from twangboy/fix_32031 
Remove list2cmdline usage from win_service.py
 2016-03-30 08:43:17 -06:00
Mike Place
7fce438b67 Merge pull request #32239 from alprs/fix-file_log_warning 
Add state file name to warning log line
 2016-03-30 08:37:54 -06:00
Andreas Lutro
72adae3702 add state file name to log line 2016-03-30 15:46:53 +02:00
Bo Maryniuk
f4d9881e61 Force-sort the RPM output to ensure latest version of the multi-package on top of the list. 2016-03-30 12:14:21 +02:00
twangboy
58772b036d Remove list2cmdline usage 2016-03-29 16:14:10 -06:00
Erik Johnson
e7fb3095ce Properly handle yum/zypper repositories in pkgrepo.managed 
When comparing the current state of the repo to the desired state, there
is a key called ``disabled`` which we support, which is not in the
``pkg.get_repo`` return data. This caused yum repos to always identify
as needing to be modified, and calling ``pkg.mod_repo`` every time the
state was run.

This commit fixes this behavior and also improves the documentation for
this state.
 2016-03-29 15:29:32 -05:00
Erik Johnson
add2111fec Use six.iteritems instead of dict.items 
Also more reliably handle commands run in pkg.mod_repo
 2016-03-29 15:29:32 -05:00
Erik Johnson
6c21881c38 Docstring tweaks 2016-03-29 15:29:32 -05:00
Erik Johnson
ecbb78b649 Remove useless function 
This function is not called if not present, so it serves no purpose
 2016-03-29 15:29:32 -05:00
Erik Johnson
06f3309552 Normalize variable naming to match other functions 2016-03-29 15:29:32 -05:00
Erik Johnson
690537ca8b Look for apt-add-repository in PATH instead of assuming it's there 
Depending on the ubuntu version, apt-add-repository is provided by
different packages. Some versions put it in python-software-properties,
and some put it in software-properties-common. It is incorrect to assume
it's there because the ``softwareproperties`` python module is
available, since it is provided by python-software-properties (and
apt-add-repository may or not be also provided by that package).
 2016-03-29 15:29:32 -05:00
Erik Johnson
709d80bb1b aptpkg: Accept **kwargs instead of a dict for pkg.expand_repo_def 2016-03-29 15:29:31 -05:00
twangboy
b7fcae97ce Create minion.d directory, fixes #31976 2016-03-29 14:17:24 -06:00
David Murphy
96cf024e63 Fix version check, fix extracting Major and Minor versions from __version__ 2016-03-29 13:56:24 -06:00
Mike Place
3c3028f347 Merge pull request #32215 from DSRCompany/issues/rhel_oscodename 
rhel oscodename
 2016-03-29 13:14:50 -06:00
Mike Place
3309ff6a29 Merge pull request #32218 from cachedout/issue_31501 
Only display error when tty is True in salt-ssh
 2016-03-29 13:13:44 -06:00
Mike Place
6795d6aef0 Only display error when tty is True in salt-ssh 2016-03-29 12:08:24 -06:00