valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,393 Commits 24 Branches 182 Tags 341 MiB
50d1df2482
Commit Graph

61393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Hammons
50d1df2482 Fixes windows download paths to account for patch 2016-03-30 14:26:03 -06: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
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
twangboy
58772b036d Remove list2cmdline usage 2016-03-29 16:14:10 -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
jacobhammons
bf59f06733 Merge pull request #32217 from jacobhammons/dot8 
2015.8.8.2 release notes
 2016-03-29 11:53:22 -06:00
Dmitry Kuzmenko
dc2a3b81ac Ignore lsb codename from os-release for newest RHEL 2016-03-29 20:02:30 +03:00
Nicole Thomas
ab8b70d985 Merge pull request #32212 from rallytime/bp-32197 
Back-port #32197 to 2015.8
 2016-03-29 09:50:58 -06:00
Nicole Thomas
200d82cc3e Merge pull request #32211 from rallytime/bp-32210 
Back-port #32210 to 2015.8
 2016-03-29 09:50:42 -06:00
Nicole Thomas
32da8d4c57 Merge pull request #32209 from rallytime/bp-32208 
Back-port #32208 to 2015.8
 2016-03-29 09:50:27 -06:00
Todd Wells
5fdd81ace9 documentation fix issue 31844 2016-03-29 09:11:29 -06:00
rallytime
7b9c05487c Whitespace fix. 2016-03-29 09:08:58 -06:00
Todd Wells
abd432746c documentation-fix-31931 2016-03-29 09:08:58 -06:00
Todd Wells
79086f8f04 service.py documentation update for 32084 2016-03-29 09:08:58 -06:00
rallytime
777a2c4e83 Whitespace fix. 2016-03-29 09:05:03 -06:00
Todd Wells
e3db0640ec service.py documentation update for 32084 2016-03-29 09:05:03 -06:00
Mike Place
7154104591 Merge pull request #32204 from ticosax/label-from-image 
[dockerng] Consider labels carried by the image when comparing user defined labels.
 2016-03-29 08:39:22 -06:00
Jacob Hammons
596444e2b4 2015.8.8.2 release notes 
Adds banner notifiying user when they are viewing release notes for an old release
 2016-03-29 06:38:04 -06:00
Nicolas Delaby
c989ae5a7e Merge user defined labels with one carried by the image 2016-03-29 11:50:08 +02:00
Mike Place
5877a19f59 Merge pull request #32186 from rallytime/testing-docs 
Add some "best practices" information to test documentation
 2016-03-28 18:22:48 -06:00
Nicole Thomas
b44adffc12 Merge pull request #32176 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-28 17:16:09 -06:00
rallytime
e8658697a6 Pylint fix for integration import 2016-03-28 16:56:22 -06:00
rallytime
40d09c822e Add some "best practices" information to test documentation 
Also clarifies some sections and fixes some broken links.
 2016-03-28 14:23:42 -06:00
rallytime
527bc3e491 Pylint fix 2016-03-28 11:24:45 -06:00
rallytime
e9abd2d420 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/rh_service.py
 2016-03-28 10:51:23 -06:00
Mike Place
6b8b8b51c0 Merge pull request #32154 from Ch3LL/ch3ll_pam_2015.5 
Add integration tests for salt-api using pam eauth
 2016-03-28 10:06:36 -06:00
Mike Place
1afb048801 Merge pull request #32163 from rallytime/fix-27605 
Update nacl.config docs to use key value instead of 'None'
 2016-03-28 08:46:40 -06:00
Mike Place
c08ba3f8a9 Merge pull request #32166 from vutny/fix-multiline-yaml-string-example 
`salt.states.file`: correct examples with multiline YAML string
 2016-03-28 08:45:32 -06:00
Nicole Thomas
230443be6c Merge pull request #32170 from gtmanfred/lxc_cloud_name 
add name for lxc for use with cloud cache
 2016-03-28 08:34:16 -06:00
Denys Havrysh
34aaea93b4 Another indentation fix in salt.states.alternatives 2016-03-28 15:48:02 +03:00
Denys Havrysh
85d0576583 salt.states.file: correct examples with multiline YAML string 2016-03-28 15:48:02 +03:00
Daniel Wallace
eb7d82e7be add name for lxc for use with cloud cache 
needed for use in `cache_node` in salt/utils/cloud.py
 2016-03-27 21:36:34 -05:00
Nicole Thomas
f2e986cf65 Merge pull request #32168 from rallytime/lint-2015.8 
Lint 2015.8
 2016-03-27 12:26:50 -06:00
rallytime
ba6b19d72c Lint 2015.8 2016-03-27 12:26:02 -06:00
Nicole Thomas
32b0421a34 Merge pull request #32164 from terminalmage/issue31731-2015.5 
Make __virtual__ for rhservice.py more robust (2015.5 branch)
 2016-03-27 12:21:52 -06:00
Nicole Thomas
ae472617af Merge pull request #32165 from terminalmage/issue31731 
Make __virtual__ for rhservice.py more robust
 2016-03-27 12:21:16 -06:00
Erik Johnson
18439c4f89 Make __virtual__ for rhservice.py more robust (2015.5 branch) 
We already have an osrelease_info grain that provides a
versioninfo-style list. Using ``float()`` here is unnecessary and also a
brittle solution as it falls over when the verson contains a third part
(as an exception is raised since the string can no longer be evaluated as
a float).

Moreover, as we're not checking anything special for point releases, the
extra resolution provided by using a float is superfluous.

Additionally, this fixes incorrect logic which would result in this
module being loaded on Fedora 15, which uses systemd.
 2016-03-26 22:35:59 -05:00
Erik Johnson
559eb7da52 Make __virtual__ for rhservice.py more robust 
We already have an osrelease_info grain that provides a
versioninfo-style list. Using ``float()`` here is unnecessary and also a
brittle solution as it falls over when the verson contains a third part
(as an exception is raised since the string can no longer be evaluated as
a float).

Moreover, as we're not checking anything special for point releases, the
extra resolution provided by using a float is superfluous.

Additionally, this fixes incorrect logic which would result in this
module being loaded on Fedora 15, which uses systemd.

Fixes #31731.
 2016-03-26 22:35:24 -05:00
rallytime
e2d09f57dc Update nacl.config docs to use key value instead of 'None' 
Fixes #27605
 2016-03-26 20:56:51 -06:00
Mike Place
63c8bf3542 Merge pull request #32160 from cachedout/issue_31944 
Fix beacon tutorial docs
 2016-03-25 16:32:51 -06:00
Mike Place
104ada5b6f Fix beacon tutorial docs 
Closes #31944
 2016-03-25 16:31:39 -06:00
Ch3LL
ba605b0128 fix more pylint and add ability to close cherrypy engine 2016-03-25 12:06:39 -06:00
Mike Place
bff94a5160 Merge pull request #32145 from paclat/issue_29817 
fixes 29817
 2016-03-25 10:55:47 -06:00
Mike Place
6212e9aa56 Merge pull request #32141 from paclat/issue_32108 
fixes 32108
 2016-03-25 10:50:59 -06:00
Mike Place
245249d347 Merge pull request #32133 from basepi/api_user_passthrough 
Pass eauth user/groups through salt-api to destination functions
 2016-03-25 10:49:46 -06:00
Colton Myers
41ba309839 Change the kwarg names to be more specific 2016-03-25 09:56:11 -06:00
Mike Place
a09aa18036 Merge pull request #32127 from rallytime/dunder-docs 
Add runners to __salt__ docs
 2016-03-25 09:54:02 -06:00