twangboy
00e6aaa2f0
Use available
2016-03-18 13:06:19 -06:00
twangboy
37ad44cb06
Change upgrade to update
2016-03-18 11:48:31 -06:00
twangboy
972e11db24
Improve error handling for mac_softwareupdate
2016-03-18 11:30:33 -06:00
twangboy
56c0abc4a5
Fix list_upgrades test
2016-03-18 11:30:33 -06:00
twangboy
3114357b13
Add integration tests for mac_softwareupdate
2016-03-18 11:30:33 -06:00
twangboy
dca667c853
Fix mac_softareupdate execution module
2016-03-18 11:30:33 -06:00
Nicole Thomas
fb6d5fa44b
Merge pull request #31946 from rallytime/merge-31886
...
Fix pylint for #31886
2016-03-17 09:45:10 -06:00
Mike Place
7fabdbc42a
Merge pull request #31741 from cro/adext
...
Add ability for external_auth minions to be pulled from LDAP/AD
2016-03-17 09:04:49 -06:00
rallytime
98267ca100
Fix pylint for #31886
...
Merges #31886
2016-03-17 09:01:59 -06:00
Nicole Thomas
6d253d775b
Merge pull request #31940 from sjorge/2016.3-schedule
...
seconds is not always set, do not assume it is
2016-03-17 08:55:12 -06:00
Nicole Thomas
11642ed5b3
Merge pull request #31932 from sjorge/2016.3-badrebasesystembroken
...
fix broken system module on SunOS cause by a0a66fa32600751d394d724b2f…
2016-03-17 08:46:20 -06:00
Jorge Schrauwen
72c5d91306
seconds is not always set, do not assume it is
2016-03-17 11:47:31 +00:00
Ch3LL
b761059405
add absolute_import
2016-03-16 20:58:41 -06:00
C. R. Oldham
4c112292f6
Prevent stacktrace when eauth is not a dict
2016-03-16 16:48:39 -06:00
Jorge Schrauwen
d2222268df
fix broken system module on SunOS cause by a0a66fa326
2016-03-16 22:23:57 +00:00
Ch3LL
5bcc5b2f21
fix pylint and remove super()
2016-03-16 11:44:55 -06:00
C. R. Oldham
53476f0be4
Fix bad merge.
2016-03-16 11:13:37 -06:00
C. R. Oldham
8a7b8853fa
Fix structure of examples for external auth (was missing ':'), wrap some ldap calls in try/except, return a modified auth_list that replaces 'ldap()' entries with ldap matches instead of appending.
2016-03-16 10:44:54 -06:00
C. R. Oldham
22d14e1097
Lint.
2016-03-16 10:44:54 -06:00
C. R. Oldham
4ebe31a107
k
2016-03-16 10:44:54 -06:00
C. R. Oldham
0aebfae725
Remove adext.py, not enough changes from ldap.py to warrant separate module. Add call in auth/__init__.py to do necessary lookups
2016-03-16 10:44:00 -06:00
C. R. Oldham
b17753d3a1
Initial commit
2016-03-16 10:42:16 -06:00
C. R. Oldham
7c3f188b36
Lint.
2016-03-16 10:42:16 -06:00
C. R. Oldham
7aaa893549
k
2016-03-16 10:42:16 -06:00
C. R. Oldham
b4f902db1a
Remove adext.py, not enough changes from ldap.py to warrant separate module. Add call in auth/__init__.py to do necessary lookups
2016-03-16 10:42:16 -06:00
C. R. Oldham
701da1707a
Initial commit
2016-03-16 10:42:16 -06:00
Mike Place
1b65b48ac3
Merge pull request #31877 from alprs/fix-salt_ssh_log
...
Set option.explicit when passing from Saltfile
2016-03-15 16:16:26 -06:00
Mike Place
c28fc6e1d8
Merge pull request #31893 from Unity-Technologies/hotfix/windows-proxy-enable
...
Hotfix/windows proxy enable
2016-03-15 12:58:33 -06:00
Nicole Thomas
4f7aad7be5
Merge pull request #31882 from jacobhammons/rel-notes
...
Updated release notes & module reference
2016-03-15 10:56:36 -06:00
Daniel Hobley
415cc8efab
Make sure we enable the proxy settings on windows
2016-03-15 12:02:12 +01:00
Daniel Hobley
4884844ad6
Only include state changes if something actually happened
2016-03-15 12:00:41 +01:00
Jacob Hammons
fd7f7bcddf
Updated release notes
...
Added a shortcut to link to pull requests
Added doc entries for all new modules
removed the unnecessary :undoc-members: option from recent doc module entries
2016-03-14 16:34:22 -06:00
Nicole Thomas
2c0edf25fd
Merge pull request #31874 from rallytime/fix-doc-errors
...
Fix doc test errors for boto_datapipeline and boto_iot modules
2016-03-14 12:19:03 -06:00
Andreas Lutro
2aceacdfcb
set option.explicit when passing from Saltfile
...
fixes #27491
2016-03-14 19:05:13 +01:00
rallytime
51c4840bde
Update CLI Examples for boto_iot module
2016-03-14 11:13:13 -06:00
rallytime
c81ee0c3f8
Update CLI Examples for boto_datapipeline module
2016-03-14 11:04:15 -06:00
Mike Place
4adc25b3b3
Merge pull request #31830 from Unity-Technologies/hotfix/keychain-cert-changed
...
Hotfix/keychain cert changed
2016-03-14 10:59:54 -06:00
Mike Place
8268e9b289
Merge pull request #31846 from cro/proxy_infinite_loop
...
Proxy infinite loop
2016-03-14 09:17:13 -06:00
C. R. Oldham
c739127ac5
Extra comment.
2016-03-14 07:15:46 -06:00
C. R. Oldham
5366daafa8
Fix event bus flood caused by unexpected recursive call.
2016-03-14 07:15:46 -06:00
Daniel Hobley
4d75b817af
Lint fixes
2016-03-14 09:32:45 +01:00
Nicole Thomas
aed7d2abb1
Merge pull request #31853 from rallytime/merge-2016.3
...
[2016.3] Merge forward from 2015.8 to 2016.3
2016-03-12 20:00:31 -07:00
rallytime
54c76ebf33
Merge branch '2015.8' into '2016.3'
2016-03-12 19:12:08 -07:00
Nicole Thomas
0c00b852ee
Merge pull request #31843 from sjorge/2016.3-execption-imgadm
...
salt.states.smartos.image_vacuum should not throw and exception
2016-03-12 19:06:52 -07:00
Jorge Schrauwen
495ae6907c
salt.states.smartos.image_vacuum should not throw and exception when not running as a highstate
2016-03-12 11:42:03 +00:00
Nicole Thomas
3f88f3a8cf
Merge pull request #31839 from jfindlay/2015.8
...
add 2015.8.8 release notes
2016-03-11 16:23:34 -07:00
Justin Findlay
47ac41ba27
add 2015.8.8 release notes
2016-03-11 16:14:54 -07:00
Nicole Thomas
349216787d
Merge pull request #31823 from rallytime/bp-31364
...
Back-port #31364 to 2016.3
2016-03-11 14:46:24 -07:00
Nicole Thomas
46bdd10a56
Merge pull request #31828 from gtmanfred/2015.8
...
Remove ability of authenticating user to specify pam service
2016-03-11 13:40:37 -07:00
Daniel Wallace
7c3134a3d3
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:24:37 -07:00
