Brian Stevenson
|
1500aae027
|
set deleted value to list
|
2016-03-23 13:47:12 -07:00 |
|
Brian Stevenson
|
1dc8f5f289
|
unit test update
grain value looks for list in assertion
|
2016-03-23 10:50:32 -07:00 |
|
Brian Stevenson
|
39adf86fec
|
Fixed negation logic
|
2016-03-22 21:53:34 -07:00 |
|
Brian Stevenson
|
be9388173b
|
Removed has_key in lieu of in
|
2016-03-22 21:33:13 -07:00 |
|
Brian Stevenson
|
e48593ed81
|
Comments and Changes output fixes
Changes returns a dict with deleted key and list of values.
Improved newline handling for comment output
|
2016-03-22 18:09:11 -07:00 |
|
Brian Stevenson
|
b98f5517de
|
Updated to conform to proper ret values
|
2016-03-22 15:49:39 -07:00 |
|
Brian Stevenson
|
d18b4be80b
|
remove whitespace end of line 186:q
|
2016-03-22 11:57:30 -07:00 |
|
Brian Stevenson
|
d2b89c85ad
|
fix formating
|
2016-03-22 11:12:12 -07:00 |
|
Brian Stevenson
|
103cee9e29
|
cleaned up formating
|
2016-03-22 11:10:02 -07:00 |
|
Brian Stevenson
|
7a4d7f0bff
|
added whitespace
|
2016-03-22 10:58:17 -07:00 |
|
Brian Stevenson
|
8ea5b545b0
|
Loop through list values in list_absent
Fixes #32052. List_absent now loops through items list.
|
2016-03-22 10:44:24 -07:00 |
|
Mike Place
|
0e66f678d4
|
Merge pull request #32002 from abednarik/pkg_manjaron_issue31788
Added Manajro Linux to virtual.
|
2016-03-21 11:55:15 -06:00 |
|
abednarik
|
1b052d0a66
|
Added Manajro Linux to virtual.
List extended with ManajaroLinux in order su load pacman module.
Fixes #31788.
|
2016-03-19 10:54:29 -03:00 |
|
Nicole Thomas
|
ba5bf62c1a
|
Merge pull request #31957 from rallytime/merge-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
|
2016-03-18 09:12:22 -06:00 |
|
Nicole Thomas
|
a52e3ad7a1
|
Merge pull request #31972 from terminalmage/zh-584
Make lack of python-ldap module more explicit when LDAP eauth is enabled
|
2016-03-18 09:11:58 -06:00 |
|
Erik Johnson
|
1e5639e495
|
Make lack of python-ldap module more explicit when LDAP eauth is enabled
|
2016-03-17 21:05:55 -05:00 |
|
rallytime
|
1b6ec5d445
|
Merge branch '2014.7' into '2015.5'
Conflicts:
- pkg/windows/installer/Salt-Minion-Setup.nsi
|
2016-03-17 12:30:53 -06:00 |
|
Mike Place
|
ba73deee46
|
Merge pull request #31929 from twangboy/fix_build_script
Fix nsi script to work with new build process
|
2016-03-17 08:59:27 -06:00 |
|
Mike Place
|
2d1f2a0c2e
|
Merge pull request #31935 from twangboy/fix_build_script2
Back port nullsoft build script from 2015.8
|
2016-03-17 08:54:50 -06:00 |
|
twangboy
|
4af8c9dbfc
|
Back port nullsoft build script from 2015.8
|
2016-03-16 17:57:04 -06:00 |
|
twangboy
|
2c5599d2bc
|
Backport build script from 2015.8
|
2016-03-16 17:52:33 -06:00 |
|
twangboy
|
ce74991dd0
|
Fix nsi script to work with new build process
|
2016-03-16 19:53:44 +00:00 |
|
Mike Place
|
43240dc566
|
Merge pull request #31912 from jfindlay/log_mixin
log.mixins: remove extermporaneous .record
|
2016-03-15 19:56:46 -06:00 |
|
Justin Findlay
|
9f9c694654
|
log.mixins: remove extermporaneous .record
|
2016-03-15 16:54:09 -06:00 |
|
Mike Place
|
440e0dcbe0
|
Merge pull request #31825 from jtand/udpate_pylintrc
Updated .testing.pylintrc to match newer versions of pylint
|
2016-03-15 12:12:44 -06:00 |
|
Nicole Thomas
|
471c9444a3
|
Merge pull request #31900 from rallytime/fix-psutil-warning
Add "python module" clarification to ps __virtual__ warning.
|
2016-03-15 11:59:35 -06:00 |
|
rallytime
|
22403d69ae
|
Add "python module" clarification to ps __virtual__ warning.
Added based on comment from Issue #31867
|
2016-03-15 10:53:12 -06:00 |
|
justinta89
|
9a14e02766
|
Updated beacons/sh.py to work with enumerate()
|
2016-03-14 16:13:40 -06:00 |
|
Mike Place
|
c44c1b5e59
|
Merge pull request #31878 from rallytime/fix-psutil-warning
Make sure __virtual__ error message is helpful when psutil is missing
|
2016-03-14 15:31:42 -06:00 |
|
justinta89
|
0ecec691a0
|
Adjusted beacons to work with enumerate better
|
2016-03-14 14:33:32 -06:00 |
|
rallytime
|
44b29f72a1
|
Make sure __virtual__ error message is helpful when psutil is missing
Fixes #19659
Fixes #31867
|
2016-03-14 12:33:53 -06:00 |
|
justinta89
|
f509b4113e
|
Fixed final lint error
|
2016-03-14 11:28:40 -06:00 |
|
justinta89
|
5945b3f11f
|
Fix and disable pylint errors
|
2016-03-14 10:38:07 -06:00 |
|
justinta89
|
06ae6eaf55
|
Fixed pylint errors on jboss state and module
|
2016-03-14 10:34:51 -06:00 |
|
justinta89
|
de96db97c8
|
Fixed more pylint errors, and disabled some more
|
2016-03-14 09:42:08 -06:00 |
|
Nicole Thomas
|
5c592b6768
|
Merge pull request #31852 from rallytime/merge-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
|
2016-03-12 19:47:02 -07:00 |
|
rallytime
|
1470de17fa
|
Merge branch '2014.7' into '2015.5'
|
2016-03-12 19:08:20 -07:00 |
|
Nicole Thomas
|
218c902091
|
Merge pull request #31834 from jfindlay/2014.7
add 2014.7.8 release notes
|
2016-03-11 14:35:42 -07:00 |
|
Justin Findlay
|
358fdad0c8
|
add 2014.7.8 release notes
|
2016-03-11 14:31:51 -07:00 |
|
Nicole Thomas
|
a423c6cd04
|
Merge pull request #31833 from jfindlay/2014.7
add 2014.7.9 release notes
|
2016-03-11 14:19:55 -07:00 |
|
justinta89
|
c07b0a20b5
|
Merge branch 'lint_fixes' into udpate_pylintrc
|
2016-03-11 14:10:43 -07:00 |
|
Justin Findlay
|
6910fcc584
|
add 2014.7.9 release notes
|
2016-03-11 14:08:55 -07:00 |
|
Nicole Thomas
|
c5e7c03953
|
Merge pull request #31826 from gtmanfred/2014.7
Remove ability of authenticating user to specify pam service
|
2016-03-11 13:41:01 -07:00 |
|
Nicole Thomas
|
0cc1d5db03
|
Merge pull request #31827 from gtmanfred/2015.5
Remove ability of authenticating user to specify pam service
|
2016-03-11 13:40:18 -07:00 |
|
justinta89
|
2e6a152308
|
Fixed lint error in lxc.py
|
2016-03-11 12:54:20 -07:00 |
|
justinta89
|
908ca1a439
|
Fixed lint error in ssh_py_shim
|
2016-03-11 12:52:52 -07:00 |
|
justinta89
|
404c1b50f7
|
Changed range(len()) to enumerate()
|
2016-03-11 11:50:05 -07:00 |
|
justinta89
|
1e13586546
|
Changed range(len()) to enumerate()
|
2016-03-11 11:48:33 -07:00 |
|
justinta89
|
9ccce7a9a5
|
Added more disables
|
2016-03-11 11:29:21 -07:00 |
|
Daniel Wallace
|
979173b78a
|
Remove ability of authenticating user to specify pam service
This should be set at the master level, so that whoever is
authenticating has to conform to what is set by the administrator that
setup salt.
|
2016-03-11 11:25:48 -07:00 |
|